CB-7690 InAppBrowser loadstart/loadstop events issues

Subscribing to events before navigating
2014-10-15 03:23:26 +04:00
parent 71b43d39a4
commit 3f80b0b59c
3 changed files with 22 additions and 13 deletions
@@ -29,11 +29,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
    function doOpen(url, target, params, numExpectedRedirects) {
        numExpectedRedirects = numExpectedRedirects || 0;
        console.log("Opening " + url);
-        var iab = window.open(url, target, params);
-        if (!iab) {
-            alert('window.open returned ' + iab);
-            return;
-        }
+
        var counts;
        var lastLoadStartURL;
        var wasReset = false;
@@ -48,6 +44,17 @@ exports.defineManualTests = function (contentEl, createActionButton) {
        }
        reset();

+        var iab = window.open(url, target, params, {
+            loaderror: logEvent,
+            loadstart: logEvent,
+            loadstop: logEvent,
+            exit: logEvent
+        });
+        if (!iab) {
+            alert('window.open returned ' + iab);
+            return;
+        }
+        
        function logEvent(e) {
            console.log('IAB event=' + JSON.stringify(e));
            counts[e.type]++;
@@ -85,10 +92,6 @@ exports.defineManualTests = function (contentEl, createActionButton) {
                }
            }
        }
-        iab.addEventListener('loaderror', logEvent);
-        iab.addEventListener('loadstart', logEvent);
-        iab.addEventListener('loadstop', logEvent);
-        iab.addEventListener('exit', logEvent);

        return iab;
    }