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 4D67E101EF for ; Tue, 15 Apr 2014 00:11:57 +0000 (UTC) Received: (qmail 83424 invoked by uid 500); 15 Apr 2014 00:11:56 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 83381 invoked by uid 500); 15 Apr 2014 00:11:56 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 83374 invoked by uid 99); 15 Apr 2014 00:11:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Apr 2014 00:11:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 502E598DBFC; Tue, 15 Apr 2014 00:11:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: commits@cordova.apache.org Message-Id: <1a67826be4f046d382f9d280dd40df5a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: CB-3324 Add support for back-button inappbrowser [WP8] if there is no history -> InAppBrowser is closed Date: Tue, 15 Apr 2014 00:11:56 +0000 (UTC) Repository: cordova-plugin-inappbrowser Updated Branches: refs/heads/dev 34c29dc2e -> 1c3223635 CB-3324 Add support for back-button inappbrowser [WP8] if there is no history -> InAppBrowser is closed Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/1c322363 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/1c322363 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/1c322363 Branch: refs/heads/dev Commit: 1c32236353d8fc118a8449464ba7cd8f93a5eee2 Parents: 34c29dc Author: Jesse MacFadyen Authored: Mon Apr 14 17:11:36 2014 -0700 Committer: Jesse MacFadyen Committed: Mon Apr 14 17:11:36 2014 -0700 ---------------------------------------------------------------------- src/wp/InAppBrowser.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/1c322363/src/wp/InAppBrowser.cs ---------------------------------------------------------------------- diff --git a/src/wp/InAppBrowser.cs b/src/wp/InAppBrowser.cs index 7239c8a..4026a95 100644 --- a/src/wp/InAppBrowser.cs +++ b/src/wp/InAppBrowser.cs @@ -331,6 +331,8 @@ namespace WPCordovaClassLib.Cordova.Commands bar.IsVisible = !StartHidden; AppBar = bar; + page.BackKeyPress += page_BackKeyPress; + } } @@ -338,6 +340,23 @@ namespace WPCordovaClassLib.Cordova.Commands }); } + void page_BackKeyPress(object sender, System.ComponentModel.CancelEventArgs e) + { +#if WP8 + if (browser.CanGoBack) + { + browser.GoBack(); + } + else + { + close(); + } + e.Cancel = true; +#else + browser.InvokeScript("execScript", "history.back();"); +#endif + } + void browser_LoadCompleted(object sender, System.Windows.Navigation.NavigationEventArgs e) { @@ -405,8 +424,10 @@ namespace WPCordovaClassLib.Cordova.Commands grid.Children.Remove(browser); } page.ApplicationBar = null; + page.BackKeyPress -= page_BackKeyPress; } } + browser = null; string message = "{\"type\":\"exit\"}"; PluginResult result = new PluginResult(PluginResult.Status.OK, message);