cleaning up window/helpers

lib/sdk/window/helpers.js

@@ -7,37 +7,35 @@ const { defer } = require('../core/promise');
 const { open: openWindow, onFocus } = require('./utils');
 
 function open(uri, options) {
-  let deferred = defer();
-  let window = openWindow.apply(null, arguments);
-  once(window, 'load').then(deferred.resolve);
-  return deferred.promise;
+  return promise(openWindow.apply(null, arguments), 'load');
 }
 exports.open = open;
 
 function close(window) {
-  let deferred = defer();
-  once(window, 'unload').then(deferred.resolve);
+  // unload event could happen so fast that it is not resolved
+  // if we listen to unload after calling close()
+  let p = promise(window, 'unload');
   window.close();
-  return deferred.promise;
+  return p;
 }
 exports.close = close;
 
 function focus(window) {
-  let deferred = defer();
-  onFocus(window).then(deferred.resolve);
+  let p = onFocus(window);
   window.focus();
-  return deferred.promise;
+  return p;
 }
 exports.focus = focus;
 
-function once(window, evt) {
+function promise(target, evt, capture) {
   let deferred = defer();
+  capture = !!capture;
 
-  window.addEventListener(evt, function eventHandler() {
-    window.removeEventListener(evt, eventHandler, false);
-    deferred.resolve(window);
-  }, false);
+  target.addEventListener(evt, function eventHandler() {
+    target.removeEventListener(evt, eventHandler, capture);
+    deferred.resolve(target);
+  }, capture);
 
   return deferred.promise;
 }
-exports.once = once;
+exports.promise = promise;

test/addons/private-browsing-supported/windows.js

@@ -8,7 +8,7 @@ const { isPrivate } = require('sdk/private-browsing');
 const { isWindowPBSupported } = require('sdk/private-browsing/utils');
 const { isWindowPrivate } = require('../window/utils');
 const { onFocus, getMostRecentWindow, getWindowTitle, getFrames, windows, open: openWindow } = require('sdk/window/utils');
-const { open, close, focus, once } = require('sdk/window/helpers');
+const { open, close, focus, promise } = require('sdk/window/helpers');
 const { browserWindows } = require("sdk/windows");
 const winUtils = require("sdk/deprecated/window-utils");
 const { fromIterator: toArray } = require('sdk/util/array');

test/private-browsing/windows.js

@@ -5,7 +5,7 @@
 
 const { pb, pbUtils } = require('./helper');
 const { openDialog, open } = require('window/utils');
-const { once, close } = require('sdk/window/helpers');
+const { promise, close } = require('sdk/window/helpers');
 const { isPrivate } = require('sdk/private-browsing');
 const { browserWindows: windows } = require('sdk/windows');
 
@@ -17,7 +17,7 @@ exports.testPerWindowPrivateBrowsingGetter = function(assert, done) {
     private: true
   });
 
-  once(win, 'DOMContentLoaded').then(function onload() {
+  promise(win, 'DOMContentLoaded').then(function onload() {
     assert.equal(pbUtils.getMode(win),
                  true, 'Newly opened window is in PB mode');
     assert.ok(isPrivate(win), 'isPrivate(window) is true');
@@ -40,7 +40,7 @@ exports.testPerWindowPrivateBrowsingGetter = function(assert, done) {
     }
   });
 
-  once(win, 'DOMContentLoaded').then(function onload() {
+  promise(win, 'DOMContentLoaded').then(function onload() {
     assert.equal(pbUtils.getMode(win),
                  true, 'Newly opened window is in PB mode');
     assert.ok(isPrivate(win), 'isPrivate(window) is true');

test/test-window-utils2.js

@@ -51,7 +51,7 @@ exports['test new top window with options'] = function(assert, done) {
   close(window).then(done);
 };
 
-exports['test backgroundify'] = function(assert, done) {
+exports.testBackgroundify = function(assert, done) {
   let window = open('data:text/html;charset=utf-8,backgroundy');
   assert.ok(~windows().indexOf(window),
             'window is in the list of windows');