Add delegate

TransitApp · Jan 14, 2015 · 9abad6b · 9abad6b
1 parent 5be38e4
commit 9abad6b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 10 deletions.
diff --git a/SVWebViewController/SVModalWebViewController.h b/SVWebViewController/SVModalWebViewController.h
@@ -15,5 +15,6 @@
 - (instancetype)initWithURLRequest:(NSURLRequest *)request;
 
 @property (nonatomic, strong) UIColor *barsTintColor;
+@property (nonatomic, weak) id<UIWebViewDelegate> webViewDelegate;
 
 @end
diff --git a/SVWebViewController/SVModalWebViewController.m b/SVWebViewController/SVModalWebViewController.m
@@ -57,4 +57,14 @@ - (void)viewWillAppear:(BOOL)animated {
     self.navigationBar.tintColor = self.barsTintColor;
 }
 
+#pragma mark - Delegate
+
+- (void)setWebViewDelegate:(id<UIWebViewDelegate>)webViewDelegate {
+    self.webViewController.delegate = webViewDelegate;
+}
+
+- (id<UIWebViewDelegate>)webViewDelegate {
+    return self.webViewController.delegate;
+}
+
 @end
diff --git a/SVWebViewController/SVWebViewController.h b/SVWebViewController/SVWebViewController.h
@@ -12,4 +12,6 @@
 - (instancetype)initWithURL:(NSURL*)URL;
 - (instancetype)initWithURLRequest:(NSURLRequest *)request;
 
+@property (nonatomic, weak) id<UIWebViewDelegate> delegate;
+
 @end
diff --git a/SVWebViewController/SVWebViewController.m b/SVWebViewController/SVWebViewController.m
@@ -30,8 +30,9 @@ @implementation SVWebViewController
 
 - (void)dealloc {
     [self.webView stopLoading];
- 	[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
     self.webView.delegate = nil;
+    self.delegate = nil;
 }
 
 - (instancetype)initWithAddress:(NSString *)urlString {
@@ -62,7 +63,7 @@ - (void)loadView {
 }
 
 - (void)viewDidLoad {
-	[super viewDidLoad];
+    [super viewDidLoad];
     [self updateToolbarItems];
 }
 
@@ -79,8 +80,8 @@ - (void)viewDidUnload {
 - (void)viewWillAppear:(BOOL)animated {
     NSAssert(self.navigationController, @"SVWebViewController needs to be contained in a UINavigationController. If you are presenting SVWebViewController modally, use SVModalWebViewController instead.");
 
-	[super viewWillAppear:animated];
-	
+    [super viewWillAppear:animated];
+    
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
         [self.navigationController setToolbarHidden:NO animated:animated];
     }
@@ -126,7 +127,7 @@ - (UIBarButtonItem *)backBarButtonItem {
                                                               style:UIBarButtonItemStylePlain
                                                              target:self
                                                              action:@selector(goBackTapped:)];
-		_backBarButtonItem.width = 18.0f;
+        _backBarButtonItem.width = 18.0f;
     }
     return _backBarButtonItem;
 }
@@ -137,7 +138,7 @@ - (UIBarButtonItem *)forwardBarButtonItem {
                                                                  style:UIBarButtonItemStylePlain
                                                                 target:self
                                                                 action:@selector(goForwardTapped:)];
-		_forwardBarButtonItem.width = 18.0f;
+        _forwardBarButtonItem.width = 18.0f;
     }
     return _forwardBarButtonItem;
 }
@@ -218,24 +219,44 @@ - (void)updateToolbarItems {
 #pragma mark - UIWebViewDelegate
 
 - (void)webViewDidStartLoad:(UIWebView *)webView {
-	[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
     [self updateToolbarItems];
+
+    if ([self.delegate respondsToSelector:@selector(webViewDidStartLoad:)]) {
+        [self.delegate webViewDidStartLoad:webView];
+    }
 }
 
 
 - (void)webViewDidFinishLoad:(UIWebView *)webView {
-	[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
 
     if (self.navigationItem.title == nil) {
         self.navigationItem.title = [webView stringByEvaluatingJavaScriptFromString:@"document.title"];
     }
 
     [self updateToolbarItems];
+
+    if ([self.delegate respondsToSelector:@selector(webViewDidFinishLoad:)]) {
+        [self.delegate webViewDidFinishLoad:webView];
+    }
 }
 
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
-	[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
     [self updateToolbarItems];
+
+    if ([self.delegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) {
+        [self.delegate webView:webView didFailLoadWithError:error];
+    }
+}
+
+- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType {
+    if ([self.delegate respondsToSelector:@selector(webView:shouldStartLoadWithRequest:navigationType:)]) {
+        return [self.delegate webView:webView shouldStartLoadWithRequest:request navigationType:navigationType];
+    }
+
+    return YES;
 }
 
 #pragma mark - Target actions
@@ -254,7 +275,7 @@ - (void)reloadTapped:(UIBarButtonItem *)sender {
 
 - (void)stopTapped:(UIBarButtonItem *)sender {
     [self.webView stopLoading];
-	[self updateToolbarItems];
+    [self updateToolbarItems];
 }
 
 - (void)actionButtonTapped:(id)sender {