Use addEventListener if possible. Fixes issue 6680

SeleniumHQ · Apr 22, 2014 · c877e93 · dr29bart · Apr 22, 2014 · c877e93
1 parent aa55398
commit c877e93
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/javascript/selenium-core/scripts/selenium-browserbot.js b/javascript/selenium-core/scripts/selenium-browserbot.js
@@ -2349,7 +2349,11 @@ IEBrowserBot.prototype.modifySeparateTestWindowToDetectPageLoads = function(wind
     var pageUnloadDetector = function() {
         self.pageUnloading = true;
     };
-    windowObject.attachEvent("onbeforeunload", pageUnloadDetector);
+    if (win.addEventListener) {
+      win.addEventListener('beforeunload', pageUnloadDetector, true);
+    } else {
+      win.attachEvent('onbeforeunload', pageUnloadDetector);
+    }
     BrowserBot.prototype.modifySeparateTestWindowToDetectPageLoads.call(this, windowObject);
 };
 
@@ -2603,7 +2607,11 @@ IEBrowserBot.prototype._fireEventOnElement = function(eventType, element, client
     var pageUnloadDetector = function() {
         pageUnloading = true;
     };
-    win.attachEvent("onbeforeunload", pageUnloadDetector);
+    if (win.addEventListener) {
+      win.addEventListener('beforeunload', pageUnloadDetector, true);
+    } else {
+      win.attachEvent('onbeforeunload', pageUnloadDetector);
+    }
     this._modifyElementTarget(element);
     if (element[eventType]) {
         element[eventType]();