build 0.7.0

1 files changed, 23 insertions, 12 deletions

diff --git a/StoneIsland/plugins/cordova-plugin-inappbrowser/src/browser/InAppBrowserProxy.js b/StoneIsland/plugins/cordova-plugin-inappbrowser/src/browser/InAppBrowserProxy.js
index 33fbe476..da7dacd3 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-inappbrowser/src/browser/InAppBrowserProxy.js
+++ b/StoneIsland/plugins/cordova-plugin-inappbrowser/src/browser/InAppBrowserProxy.js
@@ -19,9 +19,7 @@
  *
 */
 
-var cordova = require('cordova'),
-    channel = require('cordova/channel'),
-    urlutil = require('cordova/urlutil');
+var modulemapper = require('cordova/modulemapper');
 
 var browserWrap,
     popup,
@@ -68,19 +66,23 @@ var IAB = {
     open: function (win, lose, args) {
         var strUrl = args[0],
             target = args[1],
-            features = args[2],
-            url;
+            features = args[2];
 
-        if (target === "_system" || target === "_self" || !target) {
+        if (target === "_self" || !target) {
             window.location = strUrl;
+        } else if (target === "_system") {
+            modulemapper.getOriginalSymbol(window, 'window.open').call(window, strUrl, "_blank");
         } else {
             // "_blank" or anything else
             if (!browserWrap) {
                 browserWrap = document.createElement("div");
                 browserWrap.style.position = "absolute";
+                browserWrap.style.top = "0";
+                browserWrap.style.left = "0";
+                browserWrap.style.boxSizing = "border-box";
                 browserWrap.style.borderWidth = "40px";
-                browserWrap.style.width = "calc(100% - 80px)";
-                browserWrap.style.height = "calc(100% - 80px)";
+                browserWrap.style.width = "100vw";
+                browserWrap.style.height = "100vh";
                 browserWrap.style.borderStyle = "solid";
                 browserWrap.style.borderColor = "rgba(0,0,0,0.25)";
 
@@ -105,6 +107,7 @@ var IAB = {
 
             if (features.indexOf("location=yes") !== -1 || features.indexOf("location") === -1) {
                 popup.style.height = "calc(100% - 60px)";
+                popup.style.marginBottom = "-4px";
 
                 navigationButtonsDiv = document.createElement("div");
                 navigationButtonsDiv.style.height = "60px";
@@ -190,7 +193,9 @@ var IAB = {
         if (browserWrap && popup) {
             try {
                 popup.contentWindow.eval(code);
-                hasCallback && win([]);
+                if (hasCallback) {
+                    win([]);
+                }
             } catch(e) {
                 console.error('Error occured while trying to injectScriptCode: ' + JSON.stringify(e));
             }
@@ -200,19 +205,25 @@ var IAB = {
     injectScriptFile: function (win, fail, args) {
         var msg = 'Browser cordova-plugin-inappbrowser injectScriptFile is not yet implemented';
         console.warn(msg);
-        fail && fail(msg);
+        if (fail) {
+            fail(msg);
+        }
     }, 
 
     injectStyleCode: function (win, fail, args) {
         var msg = 'Browser cordova-plugin-inappbrowser injectStyleCode is not yet implemented';
         console.warn(msg);
-        fail && fail(msg);
+        if (fail) {
+            fail(msg);
+        }
     },
 
     injectStyleFile: function (win, fail, args) {
         var msg = 'Browser cordova-plugin-inappbrowser injectStyleFile is not yet implemented';
         console.warn(msg);
-        fail && fail(msg);
+        if (fail) {
+            fail(msg);
+        }
     }
 };