zhaidi/cordova-plugin-inappbrowser
zhaidi/cordova-plugin-inappbrowser
1
0
Fork 0
forked from public/cordova-plugin-inappbrowser
Code Pull Requests Activity

[CB-4121] remove dupe code

Browse Source
This commit is contained in:
Jesse MacFadyen 2013-07-08 15:55:35 -07:00
parent 07840c164b
commit f26c35d6e3
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugin.xml
View File

@ -40,7 +40,18 @@
</feature> </feature>
</config-file> </config-file>
<source-file src="src/wp7/InAppBrowser.cs" /> <source-file src="src/wp/InAppBrowser.cs" />
</platform>
<!-- wp8 -->
<platform name="wp8">
<config-file target="config.xml" parent="/*">
<feature name="InAppBrowser">
<param name="wp-package" value="InAppBrowser"/>
</feature>
</config-file>
<source-file src="src/wp/InAppBrowser.cs" />
</platform> </platform>

37
src/wp7/InAppBrowser.cs → src/wp/InAppBrowser.cs
View File

@ -94,7 +94,6 @@ namespace WPCordovaClassLib.Cordova.Commands
} }
// Display an inderminate progress indicator
private void ShowInAppBrowser(string url) private void ShowInAppBrowser(string url)
{ {
Uri loc = new Uri(url); Uri loc = new Uri(url);
@ -113,6 +112,8 @@ namespace WPCordovaClassLib.Cordova.Commands
{ {
PhoneApplicationPage page = frame.Content as PhoneApplicationPage; PhoneApplicationPage page = frame.Content as PhoneApplicationPage;
string baseImageUrl = "Images/";
if (page != null) if (page != null)
{ {
Grid grid = page.FindName("LayoutRoot") as Grid; Grid grid = page.FindName("LayoutRoot") as Grid;
@ -121,10 +122,10 @@ namespace WPCordovaClassLib.Cordova.Commands
browser = new WebBrowser(); browser = new WebBrowser();
browser.IsScriptEnabled = true; browser.IsScriptEnabled = true;
browser.LoadCompleted += new System.Windows.Navigation.LoadCompletedEventHandler(browser_LoadCompleted); browser.LoadCompleted += new System.Windows.Navigation.LoadCompletedEventHandler(browser_LoadCompleted);
browser.Navigating += new EventHandler<NavigatingEventArgs>(browser_Navigating); browser.Navigating += new EventHandler<NavigatingEventArgs>(browser_Navigating);
browser.NavigationFailed += new System.Windows.Navigation.NavigationFailedEventHandler(browser_NavigationFailed); browser.NavigationFailed += new System.Windows.Navigation.NavigationFailedEventHandler(browser_NavigationFailed);
browser.Navigated += new EventHandler<System.Windows.Navigation.NavigationEventArgs>(browser_Navigated); browser.Navigated += new EventHandler<System.Windows.Navigation.NavigationEventArgs>(browser_Navigated);
browser.Navigate(loc); browser.Navigate(loc);
//browser.IsGeolocationEnabled = opts.isGeolocationEnabled; //browser.IsGeolocationEnabled = opts.isGeolocationEnabled;
grid.Children.Add(browser); grid.Children.Add(browser);
@ -136,22 +137,21 @@ namespace WPCordovaClassLib.Cordova.Commands
backButton = new ApplicationBarIconButton(); backButton = new ApplicationBarIconButton();
backButton.Text = "Back"; backButton.Text = "Back";
backButton.IconUri = new Uri("/Images/appbar.back.rest.png", UriKind.Relative);
backButton.IconUri = new Uri(baseImageUrl + "appbar.back.rest.png", UriKind.Relative);
backButton.Click += new EventHandler(backButton_Click); backButton.Click += new EventHandler(backButton_Click);
//backButton.IsEnabled = false;
bar.Buttons.Add(backButton); bar.Buttons.Add(backButton);
fwdButton = new ApplicationBarIconButton(); fwdButton = new ApplicationBarIconButton();
fwdButton.Text = "Forward"; fwdButton.Text = "Forward";
fwdButton.IconUri = new Uri("/Images/appbar.next.rest.png", UriKind.Relative); fwdButton.IconUri = new Uri(baseImageUrl + "appbar.next.rest.png", UriKind.Relative);
fwdButton.Click += new EventHandler(fwdButton_Click); fwdButton.Click += new EventHandler(fwdButton_Click);
//fwdButton.IsEnabled = false;
bar.Buttons.Add(fwdButton); bar.Buttons.Add(fwdButton);
ApplicationBarIconButton closeBtn = new ApplicationBarIconButton(); ApplicationBarIconButton closeBtn = new ApplicationBarIconButton();
closeBtn.Text = "Close"; closeBtn.Text = "Close";
closeBtn.IconUri = new Uri("/Images/appbar.close.rest.png", UriKind.Relative); closeBtn.IconUri = new Uri(baseImageUrl + "appbar.close.rest.png", UriKind.Relative);
closeBtn.Click += new EventHandler(closeBtn_Click); closeBtn.Click += new EventHandler(closeBtn_Click);
bar.Buttons.Add(closeBtn); bar.Buttons.Add(closeBtn);
@ -174,8 +174,11 @@ namespace WPCordovaClassLib.Cordova.Commands
{ {
try try
{ {
//browser.GoForward(); #if WP8
browser.GoForward();
#else
browser.InvokeScript("execScript", "history.forward();"); browser.InvokeScript("execScript", "history.forward();");
#endif
} }
catch (Exception) catch (Exception)
{ {
@ -190,8 +193,11 @@ namespace WPCordovaClassLib.Cordova.Commands
{ {
try try
{ {
//browser.GoBack(); #if WP8
browser.GoBack();
#else
browser.InvokeScript("execScript", "history.back();"); browser.InvokeScript("execScript", "history.back();");
#endif
} }
catch (Exception) catch (Exception)
{ {
@ -237,11 +243,14 @@ namespace WPCordovaClassLib.Cordova.Commands
void browser_Navigated(object sender, System.Windows.Navigation.NavigationEventArgs e) void browser_Navigated(object sender, System.Windows.Navigation.NavigationEventArgs e)
{ {
//if (browser != null) #if WP8
//{ if (browser != null)
// backButton.IsEnabled = browser.CanGoBack; {
// fwdButton.IsEnabled = browser.CanGoForward; backButton.IsEnabled = browser.CanGoBack;
//} fwdButton.IsEnabled = browser.CanGoForward;
}
#endif
string message = "{\"type\":\"loadstop\", \"url\":\"" + e.Uri.AbsoluteUri + "\"}"; string message = "{\"type\":\"loadstop\", \"url\":\"" + e.Uri.AbsoluteUri + "\"}";
PluginResult result = new PluginResult(PluginResult.Status.OK, message); PluginResult result = new PluginResult(PluginResult.Status.OK, message);
result.KeepCallback = true; result.KeepCallback = true;