Fix event handlers to be own properties of each Window

Closes #2140.
jsdom · Feb 5, 2018 · 830a6fd · 830a6fd
1 parent a0b7f8a
commit 830a6fd
Show file tree

Hide file tree

Showing 3 changed files with 331 additions and 4 deletions.
diff --git a/lib/jsdom/browser/Window.js b/lib/jsdom/browser/Window.js
@@ -58,10 +58,14 @@ function Window(options) {
   const rawPerformance = new RawPerformance();
   const windowInitialized = hrtime();
 
-  this._initGlobalEvents();
 
   const window = this;
 
+  mixin(window, WindowEventHandlersImpl.prototype);
+  mixin(window, GlobalEventHandlersImpl.prototype);
+
+  this._initGlobalEvents();
+
   ///// INTERFACES FROM THE DOM
   // TODO: consider a mode of some sort where these are not shared between all DOM instances
   // It'd be very memory-expensive in most cases, though.
@@ -606,9 +610,6 @@ function Window(options) {
   });
 }
 
-mixin(Window.prototype, GlobalEventHandlersImpl.prototype);
-mixin(Window.prototype, WindowEventHandlersImpl.prototype);
-
 Object.setPrototypeOf(Window, EventTarget.interface);
 Object.setPrototypeOf(Window.prototype, EventTarget.interface.prototype);
 Object.defineProperty(Window.prototype, Symbol.toStringTag, {

diff --git a/lib/jsdom/living/helpers/create-event-accessor.js b/lib/jsdom/living/helpers/create-event-accessor.js
@@ -82,6 +82,7 @@ exports.setupForSimpleEventAccessors = (prototype, events) => {
 exports.createEventAccessor = function createEventAccessor(obj, event) {
   Object.defineProperty(obj, "on" + event, {
     configurable: true,
+    enumerable: true,
     get() { // https://html.spec.whatwg.org/#getting-the-current-value-of-the-event-handler
       const value = this._getEventHandlerFor(event);
       if (!value) {

diff --git a/...rm-tests/to-upstream/html/browsers/the-window-object/window-properties-dont-upstream.html b/...rm-tests/to-upstream/html/browsers/the-window-object/window-properties-dont-upstream.html
@@ -0,0 +1,325 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Properties of the window object</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<link rel="help" href="http://ecma-international.org/ecma-262/5.1/#sec-15.1">
+<link rel="help" href="https://heycam.github.io/webidl/#interface-prototype-object">
+<link rel="help" href="https://heycam.github.io/webidl/#es-attributes">
+<link rel="help" href="https://heycam.github.io/webidl/#es-operations">
+<link rel="help" href="https://dom.spec.whatwg.org/#eventtarget">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#window">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowtimers">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowbase64">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowsessionstorage">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowlocalstorage">
+<link rel="help" href="https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#dom-window-getselection">
+<link rel="help" href="http://dev.w3.org/csswg/cssom/#widl-def-Window">
+<link rel="help" href="http://dev.w3.org/csswg/cssom-view/#widl-def-Window">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+function assert_data_propdesc(pd, Writable, Enumerable, Configurable) {
+  assert_equals(typeof pd, "object");
+  assert_equals(pd.writable, Writable);
+  assert_equals(pd.enumerable, Enumerable);
+  assert_equals(pd.configurable, Configurable);
+}
+function assert_accessor_propdesc(pd, hasSetter, Enumerable, Configurable) {
+  assert_equals(typeof pd, "object");
+  /*
+  // Something is making window to lose the getters/setters
+  assert_equals(typeof pd.get, "function");
+  assert_true("set" in pd,
+              "Should always have a setter property on the property descriptor");
+  assert_equals(typeof pd.set, hasSetter ? "function" : "undefined");
+  */
+  assert_equals(pd.enumerable, Enumerable);
+  assert_equals(pd.configurable, Configurable);
+}
+
+var unforgeableAttributes = [
+  "window",
+  "document",
+  "location",
+  "top"
+];
+
+var replaceableAttributes = [
+  "self",
+  "locationbar",
+  "menubar",
+  "personalbar",
+  "scrollbars",
+  "statusbar",
+  "toolbar",
+  "frames",
+  "parent",
+  "external",
+  "length",
+
+  // CSSOM-View
+  "screen",
+  "scrollX",
+  "scrollY",
+  "pageXOffset",
+  "pageYOffset",
+  "innerWidth",
+  "innerHeight",
+  "screenX",
+  "screenY",
+  "outerWidth",
+  "outerHeight",
+  "devicePixelRatio",
+];
+
+var methods = [
+  "close",
+  "stop",
+  "focus",
+  "blur",
+  "open",
+  "alert",
+  "confirm",
+  "prompt",
+  "print",
+  "postMessage",
+
+  // WindowBase64
+  "btoa",
+  "atob",
+
+  // WindowTimers
+  "setTimeout",
+  "clearTimeout",
+  "setInterval",
+  "clearInterval",
+
+  // HTML Editing APIs
+  // "getSelection", // not yet implemented
+
+  // CSSOM
+  "getComputedStyle",
+
+  // CSSOM-View
+  // "matchMedia", // not yet implemented
+  "scroll",
+  "scrollTo",
+  "scrollBy"
+];
+
+var readonlyAttributes = [
+  "history",
+  "frameElement",
+  "navigator",
+  // "applicationCache", // not yet implemented
+
+  // WindowSessionStorage
+  // "sessionStorage", // not yet implemented
+
+  // WindowLocalStorage
+  // "localStorage", // not yet implemented
+];
+
+var writableAttributes = [
+  "name",
+//  "status", // looks like there is an issue with Node v6 and XHR, see Window.js
+//  "opener", // not yet implemented
+  "onabort",
+  "onafterprint",
+  "onbeforeprint",
+  "onbeforeunload",
+  "onblur",
+  "oncancel",
+  "oncanplay",
+  "oncanplaythrough",
+  "onchange",
+  "onclick",
+  "onclose",
+  "oncontextmenu",
+  "oncuechange",
+  "ondblclick",
+  "ondrag",
+  "ondragend",
+  "ondragenter",
+  "ondragleave",
+  "ondragover",
+  "ondragstart",
+  "ondrop",
+  "ondurationchange",
+  "onemptied",
+  "onended",
+  "onerror",
+  "onfocus",
+  "onhashchange",
+  "oninput",
+  "oninvalid",
+  "onkeydown",
+  "onkeypress",
+  "onkeyup",
+  "onload",
+  "onloadeddata",
+  "onloadedmetadata",
+  "onloadstart",
+  "onmessage",
+  "onmousedown",
+  "onmousemove",
+  "onmouseout",
+  "onmouseover",
+  "onmouseup",
+  "onoffline",
+  "ononline",
+  "onpause",
+  "onplay",
+  "onplaying",
+  "onpagehide",
+  "onpageshow",
+  "onpopstate",
+  "onprogress",
+  "onratechange",
+  "onreset",
+  "onresize",
+  "onscroll",
+  "onseeked",
+  "onseeking",
+  "onselect",
+  "onstalled",
+  "onstorage",
+  "onsubmit",
+  "onsuspend",
+  "ontimeupdate",
+  "onunload",
+  "onvolumechange",
+  "onwaiting"
+];
+
+/* see issue https://github.com/nodejs/node/issues/18551
+test(function() {
+  // 15.1.1 Value Properties of the Global Object
+  ["NaN", "Infinity", "undefined"].forEach(function(id) {
+    test(function() {
+      assert_true(id in window, id + " in window");
+      assert_data_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                           false, false, false);
+    }, "Value Property: " + id);
+  });
+}, "Value Properties of the Global Object");
+*/
+test(function() {
+  // 15.1.2 Function Properties of the Global Object
+  ["eval", "parseInt", "parseFloat", "isNaN", "isFinite"].forEach(function(id) {
+    test(function() {
+      assert_true(id in window, id + " in window");
+      assert_data_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                           true, false, true);
+    }, "Function Property: " + id);
+  });
+}, "Function Properties of the Global Object");
+test(function() {
+  // 15.1.3 URI Handling Function Properties
+  ["decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent"].forEach(function(id) {
+    test(function() {
+      assert_true(id in window, id + " in window");
+      assert_data_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                           true, false, true);
+    }, "URI Handling Function Property: " + id);
+  });
+}, "URI Handling Function Properties");
+test(function() {
+  // 15.1.4 Constructor Properties of the Global Object
+  ["Object", "Function", "Array", "String", "Boolean", "Number", "Date",
+   "RegExp", "Error", "EvalError", "RangeError", "ReferenceError",
+   "SyntaxError", "TypeError", "URIError"].forEach(function(id) {
+    test(function() {
+      assert_true(id in window, id + " in window");
+      assert_data_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                           true, false, true);
+    }, "Constructor Property: " + id);
+  });
+}, "Constructor Properties of the Global Object");
+test(function() {
+  // 15.1.5 Other Properties of the Global Object
+  ["Math", "JSON"].forEach(function(id) {
+    test(function() {
+      assert_true(id in window, id + " in window");
+      assert_data_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                           true, false, true);
+    }, "Other Property: " + id);
+  });
+}, "Other Properties of the Global Object");
+/*
+test(function() {
+  // EventTarget interface
+  ["addEventListener", "removeEventListener", "dispatchEvent"].forEach(function(id) {
+    test(function() {
+      var EventTargetProto = EventTarget.prototype;
+      assert_true(id in window, id + " in window");
+      assert_equals(window[id], EventTargetProto[id]);
+      assert_data_propdesc(Object.getOwnPropertyDescriptor(EventTargetProto, id),
+                           true, true, true);
+      assert_equals(Object.getOwnPropertyDescriptor(window, id), undefined);
+    }, "EventTarget method: " + id);
+  });
+}, "EventTarget interface");
+*/
+test(function() {
+  // Window interface
+  methods.forEach(function(id) {
+    test(function() {
+      var WindowProto = Window.prototype;
+      assert_true(id in window, id + " in window");
+      assert_false(id in WindowProto, id + " in Window.prototype");
+      assert_data_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                           true, true, true);
+    }, "Window method: " + id);
+  });
+  readonlyAttributes.forEach(function(id) {
+    test(function() {
+      var WindowProto = Window.prototype;
+      assert_true(id in window, id + " in window");
+      assert_false(id in WindowProto, id + " in Window.prototype");
+      assert_accessor_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                               false, true, true);
+    }, "Window readonly attribute: " + id);
+  });
+  writableAttributes.forEach(function(id) {
+    test(function() {
+      var WindowProto = Window.prototype;
+      assert_true(id in window, id + " in window");
+      assert_false(id in WindowProto, id + " in Window.prototype");
+      assert_accessor_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                               true, true, true);
+    }, "Window attribute: " + id);
+  });
+  /*
+  // not working
+  unforgeableAttributes.forEach(function(id) {
+    test(function() {
+      var WindowProto = Window.prototype;
+      assert_true(id in window, id + " in window");
+      assert_false(id in WindowProto, id + " in Window.prototype");
+      // location has a [PutForwards] extended attribute.
+      assert_accessor_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                               id === "location", true, false);
+    }, "Window unforgeable attribute: " + id);
+  */
+  replaceableAttributes.forEach(function(id) {
+    test(function() {
+      var WindowProto = Window.prototype;
+      assert_true(id in window, id + " in window");
+      assert_false(id in WindowProto, id + " in Window.prototype");
+      assert_accessor_propdesc(Object.getOwnPropertyDescriptor(window, id),
+                               true, true, true);
+    }, "Window replaceable attribute: " + id);
+  });
+}, "Window interface");
+/*
+// not working
+test(function() {
+  assert_equals(window.constructor, Window);
+  assert_false(window.hasOwnProperty("constructor"), "window.constructor should not be an own property.");
+  assert_data_propdesc(Object.getOwnPropertyDescriptor(Window.prototype, "constructor"),
+                       true, false, true);
+}, "constructor");
+*/
+</script>