merge issues, wp7+8 differ on this command
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp7/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp7/commit/35580992 Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp7/tree/35580992 Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp7/diff/35580992 Branch: refs/heads/master Commit: 35580992b1c7e9575503ce9f152e426ec2e1ef30 Parents: d70276d ca5a6e4 Author: Jesse MacFadyen <[email protected]> Authored: Tue Apr 23 15:06:11 2013 -0700 Committer: Jesse MacFadyen <[email protected]> Committed: Tue Apr 23 15:06:11 2013 -0700 ---------------------------------------------------------------------- templates/standalone/Plugins/InAppBrowser.cs | 62 +++++++++++---------- 1 files changed, 32 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/35580992/templates/standalone/Plugins/InAppBrowser.cs ---------------------------------------------------------------------- diff --cc templates/standalone/Plugins/InAppBrowser.cs index 92835e5,2741355..62928cd --- a/templates/standalone/Plugins/InAppBrowser.cs +++ b/templates/standalone/Plugins/InAppBrowser.cs @@@ -120,8 -121,6 +121,7 @@@ namespace WPCordovaClassLib.Cordova.Com { browser = new WebBrowser(); browser.IsScriptEnabled = true; - + browser.LoadCompleted += new System.Windows.Navigation.LoadCompletedEventHandler(browser_LoadCompleted); browser.Navigating += new EventHandler<NavigatingEventArgs>(browser_Navigating);
