Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C7BD717E14 for ; Sat, 14 Mar 2015 00:18:41 +0000 (UTC) Received: (qmail 31150 invoked by uid 500); 14 Mar 2015 00:18:41 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 31122 invoked by uid 500); 14 Mar 2015 00:18:41 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 31111 invoked by uid 99); 14 Mar 2015 00:18:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Mar 2015 00:18:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C523E1805; Sat, 14 Mar 2015 00:18:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org Message-Id: <73f498153d2a4f8c994e61f9d793700a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cordova-plugins git commit: CB-8556 - fix handleOpenURL for WKWebViewEngine plugin Date: Sat, 14 Mar 2015 00:18:41 +0000 (UTC) Repository: cordova-plugins Updated Branches: refs/heads/master 0ccc653ae -> 5d5588f69 CB-8556 - fix handleOpenURL for WKWebViewEngine plugin Project: http://git-wip-us.apache.org/repos/asf/cordova-plugins/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugins/commit/5d5588f6 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugins/tree/5d5588f6 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugins/diff/5d5588f6 Branch: refs/heads/master Commit: 5d5588f6926b0aca994ba97935a01e2c89bce855 Parents: 0ccc653 Author: Shazron Abdullah Authored: Fri Mar 13 17:18:43 2015 -0700 Committer: Shazron Abdullah Committed: Fri Mar 13 17:18:43 2015 -0700 ---------------------------------------------------------------------- wkwebview-engine/src/ios/CDVWKWebViewEngine.h | 2 +- wkwebview-engine/src/ios/CDVWKWebViewEngine.m | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/5d5588f6/wkwebview-engine/src/ios/CDVWKWebViewEngine.h ---------------------------------------------------------------------- diff --git a/wkwebview-engine/src/ios/CDVWKWebViewEngine.h b/wkwebview-engine/src/ios/CDVWKWebViewEngine.h index 753a07f..2fe4bc2 100644 --- a/wkwebview-engine/src/ios/CDVWKWebViewEngine.h +++ b/wkwebview-engine/src/ios/CDVWKWebViewEngine.h @@ -20,7 +20,7 @@ #import #import -@interface CDVWKWebViewEngine : CDVPlugin +@interface CDVWKWebViewEngine : CDVPlugin @property (nonatomic, strong, readonly) id uiDelegate; http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/5d5588f6/wkwebview-engine/src/ios/CDVWKWebViewEngine.m ---------------------------------------------------------------------- diff --git a/wkwebview-engine/src/ios/CDVWKWebViewEngine.m b/wkwebview-engine/src/ios/CDVWKWebViewEngine.m index c19d7e2..63218ba 100644 --- a/wkwebview-engine/src/ios/CDVWKWebViewEngine.m +++ b/wkwebview-engine/src/ios/CDVWKWebViewEngine.m @@ -78,6 +78,8 @@ if ([self.viewController conformsToProtocol:@protocol(WKNavigationDelegate)]) { wkWebView.navigationDelegate = (id )self.viewController; + } else { + wkWebView.navigationDelegate = (id )self; } if ([self.viewController conformsToProtocol:@protocol(WKScriptMessageHandler)]) { @@ -193,4 +195,11 @@ } } +#pragma mark WKNavigationDelegate implementation + +- (void)webView:(WKWebView*)webView didFinishNavigation:(WKNavigation*)navigation +{ + [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPageDidLoadNotification object:webView]]; +} + @end --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org