re-applied fix to old file fml (cherry picked from commit 43deeaa88dddc7b34a9b5581eba6820fd5ac887c)
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp7/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp7/commit/75571679 Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp7/tree/75571679 Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp7/diff/75571679 Branch: refs/heads/master Commit: 7557167905b327244510715edfae1c9d83987e2a Parents: 97e195a Author: Jesse MacFadyen <[email protected]> Authored: Tue Apr 23 15:29:32 2013 -0700 Committer: Jesse MacFadyen <[email protected]> Committed: Tue Apr 23 15:30:13 2013 -0700 ---------------------------------------------------------------------- templates/standalone/Plugins/InAppBrowser.cs | 35 +++++++++----------- 1 files changed, 16 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/75571679/templates/standalone/Plugins/InAppBrowser.cs ---------------------------------------------------------------------- diff --git a/templates/standalone/Plugins/InAppBrowser.cs b/templates/standalone/Plugins/InAppBrowser.cs index 2741355..425f5ae 100644 --- a/templates/standalone/Plugins/InAppBrowser.cs +++ b/templates/standalone/Plugins/InAppBrowser.cs @@ -94,6 +94,7 @@ namespace WPCordovaClassLib.Cordova.Commands } + // Display an inderminate progress indicator private void ShowInAppBrowser(string url) { Uri loc = new Uri(url); @@ -112,8 +113,6 @@ namespace WPCordovaClassLib.Cordova.Commands { PhoneApplicationPage page = frame.Content as PhoneApplicationPage; - string baseImageUrl = "Images/"; - if (page != null) { Grid grid = page.FindName("LayoutRoot") as Grid; @@ -122,10 +121,10 @@ namespace WPCordovaClassLib.Cordova.Commands browser = new WebBrowser(); browser.IsScriptEnabled = true; browser.LoadCompleted += new System.Windows.Navigation.LoadCompletedEventHandler(browser_LoadCompleted); - browser.Navigating += new EventHandler<NavigatingEventArgs>(browser_Navigating); browser.NavigationFailed += new System.Windows.Navigation.NavigationFailedEventHandler(browser_NavigationFailed); browser.Navigated += new EventHandler<System.Windows.Navigation.NavigationEventArgs>(browser_Navigated); + browser.Navigate(loc); //browser.IsGeolocationEnabled = opts.isGeolocationEnabled; grid.Children.Add(browser); @@ -137,23 +136,22 @@ namespace WPCordovaClassLib.Cordova.Commands backButton = new ApplicationBarIconButton(); backButton.Text = "Back"; - - backButton.IconUri = new Uri(baseImageUrl + "appbar.back.rest.png", UriKind.Relative); + backButton.IconUri = new Uri("/Images/appbar.back.rest.png", UriKind.Relative); backButton.Click += new EventHandler(backButton_Click); - backButton.IsEnabled = false; + //backButton.IsEnabled = false; bar.Buttons.Add(backButton); fwdButton = new ApplicationBarIconButton(); fwdButton.Text = "Forward"; - fwdButton.IconUri = new Uri(baseImageUrl + "appbar.next.rest.png", UriKind.Relative); + fwdButton.IconUri = new Uri("/Images/appbar.next.rest.png", UriKind.Relative); fwdButton.Click += new EventHandler(fwdButton_Click); - fwdButton.IsEnabled = false; + //fwdButton.IsEnabled = false; bar.Buttons.Add(fwdButton); ApplicationBarIconButton closeBtn = new ApplicationBarIconButton(); closeBtn.Text = "Close"; - closeBtn.IconUri = new Uri(baseImageUrl + "appbar.close.rest.png", UriKind.Relative); + closeBtn.IconUri = new Uri("/Images/appbar.close.rest.png", UriKind.Relative); closeBtn.Click += new EventHandler(closeBtn_Click); bar.Buttons.Add(closeBtn); @@ -176,8 +174,8 @@ namespace WPCordovaClassLib.Cordova.Commands { try { - browser.GoForward(); - //browser.InvokeScript("execScript", "history.forward();"); + //browser.GoForward(); + browser.InvokeScript("execScript", "history.forward();"); } catch (Exception) { @@ -192,8 +190,8 @@ namespace WPCordovaClassLib.Cordova.Commands { try { - browser.GoBack(); - //browser.InvokeScript("execScript", "history.back();"); + //browser.GoBack(); + browser.InvokeScript("execScript", "history.back();"); } catch (Exception) { @@ -239,12 +237,11 @@ namespace WPCordovaClassLib.Cordova.Commands void browser_Navigated(object sender, System.Windows.Navigation.NavigationEventArgs e) { - if (browser != null) - { - backButton.IsEnabled = browser.CanGoBack; - fwdButton.IsEnabled = browser.CanGoForward; - - } + //if (browser != null) + //{ + // backButton.IsEnabled = browser.CanGoBack; + // fwdButton.IsEnabled = browser.CanGoForward; + //} string message = "{\"type\":\"loadstop\", \"url\":\"" + e.Uri.AbsoluteUri + "\"}"; PluginResult result = new PluginResult(PluginResult.Status.OK, message); result.KeepCallback = true;
