Fix WKNavigationDelegate methods in ExampleApp-iOS (marcuswestin#206)

eJamesLin · marcuswestin · commit f8640a0fffed · 2016-06-14T15:25:45.000-04:00
* setting ExampleUIWebViewController as UIWebViewDelegate in example

* fix WKNavigationDelegate method name, set ExampleWKWebViewController as WKNavigationDelegate
diff --git a/Example Apps/ExampleApp-iOS/ExampleUIWebViewController.m b/Example Apps/ExampleApp-iOS/ExampleUIWebViewController.m
@@ -24,6 +24,7 @@ - (void)viewWillAppear:(BOOL)animated {
     [WebViewJavascriptBridge enableLogging];
     
     _bridge = [WebViewJavascriptBridge bridgeForWebView:webView];
+    [_bridge setWebViewDelegate:self];
     
     [_bridge registerHandler:@"testObjcCallback" handler:^(id data, WVJBResponseCallback responseCallback) {
         NSLog(@"testObjcCallback called: %@", data);
diff --git a/Example Apps/ExampleApp-iOS/ExampleWKWebViewController.m b/Example Apps/ExampleApp-iOS/ExampleWKWebViewController.m
@@ -25,6 +25,7 @@ - (void)viewWillAppear:(BOOL)animated {
     [self.view addSubview:webView];
     [WKWebViewJavascriptBridge enableLogging];
     _bridge = [WKWebViewJavascriptBridge bridgeForWebView:webView];
+    [_bridge setWebViewDelegate:self];
     
     [_bridge registerHandler:@"testObjcCallback" handler:^(id data, WVJBResponseCallback responseCallback) {
         NSLog(@"testObjcCallback called: %@", data);
@@ -37,11 +38,11 @@ - (void)viewWillAppear:(BOOL)animated {
     [self loadExamplePage:webView];
 }
 
-- (void)webViewDidStartLoad:(UIWebView *)webView {
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation {
     NSLog(@"webViewDidStartLoad");
 }
 
-- (void)webViewDidFinishLoad:(UIWebView *)webView {
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
     NSLog(@"webViewDidFinishLoad");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ - (void)viewWillAppear:(BOOL)animated {`
`25`	`25`	`[self.view addSubview:webView];`
`26`	`26`	`[WKWebViewJavascriptBridge enableLogging];`
`27`	`27`	`_bridge = [WKWebViewJavascriptBridge bridgeForWebView:webView];`
	`28`	`+ [_bridge setWebViewDelegate:self];`
`28`	`29`
`29`	`30`	`[_bridge registerHandler:@"testObjcCallback" handler:^(id data, WVJBResponseCallback responseCallback) {`
`30`	`31`	`NSLog(@"testObjcCallback called: %@", data);`
`@@ -37,11 +38,11 @@ - (void)viewWillAppear:(BOOL)animated {`
`37`	`38`	`[self loadExamplePage:webView];`
`38`	`39`	`}`
`39`	`40`
`40`		`-- (void)webViewDidStartLoad:(UIWebView *)webView {`
	`41`	`+- (void)webView:(WKWebView )webView didStartProvisionalNavigation:(WKNavigation )navigation {`
`41`	`42`	`NSLog(@"webViewDidStartLoad");`
`42`	`43`	`}`
`43`	`44`
`44`		`-- (void)webViewDidFinishLoad:(UIWebView *)webView {`
	`45`	`+- (void)webView:(WKWebView )webView didFinishNavigation:(WKNavigation )navigation {`
`45`	`46`	`NSLog(@"webViewDidFinishLoad");`
`46`	`47`	`}`
`47`	`48`