github/apache-cordova-plugin-inappbrowser
github/apache-cordova-plugin-inappbrowser
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'CB-6474' of https://github.com/sgrebnov/cordova-plugin-inappbrowser into dev

Browse Source
This commit is contained in:
Jesse MacFadyen 2014-04-21 17:57:48 -07:00
commit e2a0bb8715
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/wp/InAppBrowser.cs
View File

@ -221,7 +221,7 @@ namespace WPCordovaClassLib.Cordova.Commands
if (cView != null) if (cView != null)
{ {
WebBrowser br = cView.Browser; WebBrowser br = cView.Browser;
br.Navigate(loc); br.Navigate2(loc);
} }
} }
@ -286,7 +286,7 @@ namespace WPCordovaClassLib.Cordova.Commands
if (browser != null) if (browser != null)
{ {
//browser.IsGeolocationEnabled = opts.isGeolocationEnabled; //browser.IsGeolocationEnabled = opts.isGeolocationEnabled;
browser.Navigate(loc); browser.Navigate2(loc);
} }
else else
{ {
@ -309,7 +309,7 @@ namespace WPCordovaClassLib.Cordova.Commands
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.Navigate2(loc);
if (StartHidden) if (StartHidden)
{ {
@ -487,4 +487,29 @@ namespace WPCordovaClassLib.Cordova.Commands
} }
} }
internal static class WebBrowserExtensions
{
/// <summary>
/// Improved method to initiate request to the provided URI. Supports 'data:text/html' urls.
/// </summary>
/// <param name="browser">The browser instance</param>
/// <param name="uri">The requested uri</param>
internal static void Navigate2(this WebBrowser browser, Uri uri)
{
// IE10 does not support data uri so we use NavigateToString method instead
if (uri.Scheme == "data")
{
// we should remove the scheme identifier and unescape the uri
string uriString = Uri.UnescapeDataString(uri.AbsoluteUri);
// format is 'data:text/html, ...'
string html = new System.Text.RegularExpressions.Regex("^data:text/html,").Replace(uriString, "");
browser.NavigateToString(html);
}
else
{
browser.Navigate(uri);
}
}
}
} }