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-6482' of https://github.com/sgrebnov/cordova-plugin-inappbrowser into dev

Browse Source
This commit is contained in:
Jesse MacFadyen 2014-04-21 17:44:47 -07:00
commit 907bba6cf6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wp/InAppBrowser.cs
View File

@ -58,6 +58,8 @@ namespace WPCordovaClassLib.Cordova.Commands
protected bool ShowLocation {get;set;} protected bool ShowLocation {get;set;}
protected bool StartHidden {get;set;} protected bool StartHidden {get;set;}
protected string NavigationCallbackId { get; set; }
public void open(string options) public void open(string options)
{ {
// reset defaults on ShowLocation + StartHidden features // reset defaults on ShowLocation + StartHidden features
@ -69,6 +71,7 @@ namespace WPCordovaClassLib.Cordova.Commands
string urlLoc = args[0]; string urlLoc = args[0];
string target = args[1]; string target = args[1];
string featString = args[2]; string featString = args[2];
this.NavigationCallbackId = args[3];
if (!string.IsNullOrEmpty(featString)) if (!string.IsNullOrEmpty(featString))
{ {
@ -446,7 +449,7 @@ namespace WPCordovaClassLib.Cordova.Commands
string message = "{\"type\":\"exit\"}"; string message = "{\"type\":\"exit\"}";
PluginResult result = new PluginResult(PluginResult.Status.OK, message); PluginResult result = new PluginResult(PluginResult.Status.OK, message);
result.KeepCallback = false; result.KeepCallback = false;
this.DispatchCommandResult(result); this.DispatchCommandResult(result, NavigationCallbackId);
}); });
} }
} }
@ -464,7 +467,7 @@ namespace WPCordovaClassLib.Cordova.Commands
string message = "{\"type\":\"loadstop\", \"url\":\"" + e.Uri.OriginalString + "\"}"; string message = "{\"type\":\"loadstop\", \"url\":\"" + e.Uri.OriginalString + "\"}";
PluginResult result = new PluginResult(PluginResult.Status.OK, message); PluginResult result = new PluginResult(PluginResult.Status.OK, message);
result.KeepCallback = true; result.KeepCallback = true;
this.DispatchCommandResult(result); this.DispatchCommandResult(result, NavigationCallbackId);
} }
void browser_NavigationFailed(object sender, System.Windows.Navigation.NavigationFailedEventArgs e) void browser_NavigationFailed(object sender, System.Windows.Navigation.NavigationFailedEventArgs e)
@ -472,7 +475,7 @@ namespace WPCordovaClassLib.Cordova.Commands
string message = "{\"type\":\"error\",\"url\":\"" + e.Uri.OriginalString + "\"}"; string message = "{\"type\":\"error\",\"url\":\"" + e.Uri.OriginalString + "\"}";
PluginResult result = new PluginResult(PluginResult.Status.ERROR, message); PluginResult result = new PluginResult(PluginResult.Status.ERROR, message);
result.KeepCallback = true; result.KeepCallback = true;
this.DispatchCommandResult(result); this.DispatchCommandResult(result, NavigationCallbackId);
} }
void browser_Navigating(object sender, NavigatingEventArgs e) void browser_Navigating(object sender, NavigatingEventArgs e)
@ -480,7 +483,7 @@ namespace WPCordovaClassLib.Cordova.Commands
string message = "{\"type\":\"loadstart\",\"url\":\"" + e.Uri.OriginalString + "\"}"; string message = "{\"type\":\"loadstart\",\"url\":\"" + e.Uri.OriginalString + "\"}";
PluginResult result = new PluginResult(PluginResult.Status.OK, message); PluginResult result = new PluginResult(PluginResult.Status.OK, message);
result.KeepCallback = true; result.KeepCallback = true;
this.DispatchCommandResult(result); this.DispatchCommandResult(result, NavigationCallbackId);
} }
} }