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

CB-13028 (CI) Browser builds on Travis and AppVeyor, Fixes tests on browser and browser implementation

Browse Source
This commit is contained in:
Alexander Sorokin
2017-07-27 15:55:11 +03:00
parent 32d867f8e4
commit 72ac4d7eca
5 changed files with 64 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/browser/InAppBrowserProxy.js
+24 -6
View File
@@ -31,15 +31,30 @@ var browserWrap,
function attachNavigationEvents(element, callback) {
var onError = function () {
callback({ type: "loaderror", url: this.contentWindow.location.href}, {keepCallback: true});
try {
callback({ type: "loaderror", url: this.contentWindow.location.href}, {keepCallback: true});
} catch (err) {
// blocked by CORS :\
callback({ type: "loaderror", url: null}, {keepCallback: true});
}
};
element.addEventListener("pageshow", function () {
callback({ type: "loadstart", url: this.contentWindow.location.href}, {keepCallback: true});
try {
callback({ type: "loadstart", url: this.contentWindow.location.href}, {keepCallback: true});
} catch (err) {
// blocked by CORS :\
callback({ type: "loadstart", url: null}, {keepCallback: true});
}
});
element.addEventListener("load", function () {
callback({ type: "loadstop", url: this.contentWindow.location.href}, {keepCallback: true});
try {
callback({ type: "loadstop", url: this.contentWindow.location.href}, {keepCallback: true});
} catch (err) {
// blocked by CORS :\
callback({ type: "loadstop", url: null}, {keepCallback: true});
}
});
element.addEventListener("error", onError);
@@ -49,7 +64,8 @@ function attachNavigationEvents(element, callback) {
var IAB = {
close: function (win, lose) {
if (browserWrap) {
if (win) win({ type: "exit" });
// use the "open" function callback so that the exit event is fired properly
if (IAB._win) IAB._win({ type: "exit" });
browserWrap.parentNode.removeChild(browserWrap);
browserWrap = null;
@@ -68,6 +84,8 @@ var IAB = {
target = args[1],
features = args[2];
IAB._win = win;
if (target === "_self" || !target) {
window.location = strUrl;
} else if (target === "_system") {
@@ -88,7 +106,7 @@ var IAB = {
browserWrap.onclick = function () {
setTimeout(function () {
IAB.close(win);
IAB.close();
}, 0);
};
@@ -161,7 +179,7 @@ var IAB = {
closeButton.innerHTML = "✖";
closeButton.addEventListener("click", function (e) {
setTimeout(function () {
IAB.close(win);
IAB.close();
}, 0);
});