Revert "Add Event constructor polyfill (ampproject#10401)"

This reverts commit 28f709f.
dreamofabear · Jul 29, 2017 · 383f871 · 383f871
1 parent 53925ed
commit 383f871
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 169 deletions.
diff --git a/build-system/dep-check-config.js b/build-system/dep-check-config.js
@@ -210,7 +210,6 @@ exports.rules = [
       'src/polyfills.js->src/polyfills/object-assign.js',
       'src/polyfills.js->src/polyfills/promise.js',
       'src/polyfills.js->src/polyfills/array-includes.js',
-      'src/polyfills.js->src/polyfills/event.js',
       'src/service/extensions-impl.js->src/polyfills/document-contains.js',
       'src/service/extensions-impl.js->src/polyfills/domtokenlist-toggle.js',
     ],

diff --git a/extensions/amp-access/0.1/test/test-amp-access.js b/extensions/amp-access/0.1/test/test-amp-access.js
@@ -1030,10 +1030,14 @@ describes.fakeWin('AccessService pingback', {
     service.reportViewToServer_ = sandbox.spy();
     const p = service.reportWhenViewed_(/* timeToView */ 2000);
     return Promise.resolve().then(() => {
-      const clickEvent = new MouseEvent(
-        'click',
-        {bubbles: true, cancelable: true, view: window, detail: 1}
-      );
+      let clickEvent;
+      if (document.createEvent) {
+        clickEvent = document.createEvent('MouseEvent');
+        clickEvent.initMouseEvent('click', true, true, window, 1);
+      } else {
+        clickEvent = document.createEventObject();
+        clickEvent.type = 'click';
+      }
       document.documentElement.dispatchEvent(clickEvent);
       return p;
     }).then(() => {}, () => {}).then(() => {

diff --git a/extensions/amp-bind/0.1/bind-impl.js b/extensions/amp-bind/0.1/bind-impl.js
@@ -956,7 +956,13 @@ export class Bind {
    */
   dispatchEventForTesting_(name) {
     if (getMode().test) {
-      const event = new Event(name, {bubbles: true, cancelable: true});
+      let event;
+      if (typeof this.localWin_.Event === 'function') {
+        event = new Event(name, {bubbles: true, cancelable: true});
+      } else {
+        event = this.localWin_.document.createEvent('Event');
+        event.initEvent(name, /* bubbles */ true, /* cancelable */ true);
+      }
       this.localWin_.dispatchEvent(event);
     }
   }

diff --git a/extensions/amp-live-list/0.1/amp-live-list.js b/extensions/amp-live-list/0.1/amp-live-list.js
@@ -861,10 +861,8 @@ export class AmpLiveList extends AMP.BaseElement {
   }
 
   sendAmpDomUpdateEvent_() {
-    const event = new Event(
-      AmpEvents.DOM_UPDATE,
-      {bubbles: true, cancelable: true}
-    );
+    const event = this.win.document.createEvent('Event');
+    event.initEvent(AmpEvents.DOM_UPDATE, true, true);
     this.itemsSlot_.dispatchEvent(event);
   }
 }

diff --git a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
@@ -292,14 +292,16 @@ describes.realWin('amp-sidebar 0.1 version', {
         impl.open_();
         expect(sidebarElement.hasAttribute('open')).to.be.true;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        const eventObj = new Event(
-          'keydown',
-          {bubbles: true, cancelable: true}
-        );
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('keydown', true, true);
+        }
         eventObj.keyCode = KeyCodes.ESCAPE;
         eventObj.which = KeyCodes.ESCAPE;
         const el = iframe.doc.documentElement;
-        el.dispatchEvent(eventObj);
+        el.dispatchEvent ?
+            el.dispatchEvent(eventObj) : el.fireEvent('onkeydown', eventObj);
         expect(sidebarElement.hasAttribute('open')).to.be.false;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
         expect(sidebarElement.style.display).to.equal('none');
@@ -407,7 +409,11 @@ describes.realWin('amp-sidebar 0.1 version', {
         impl.open_();
         expect(sidebarElement.hasAttribute('open')).to.be.true;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        const eventObj = new Event('click', {bubbles: true, cancelable: true});
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('click', true, true);
+        }
         sandbox.stub(sidebarElement, 'getAmpDoc', () => {
           return {
             win: {
@@ -417,7 +423,9 @@ describes.realWin('amp-sidebar 0.1 version', {
             },
           };
         });
-        anchor.dispatchEvent(eventObj);
+        anchor.dispatchEvent ?
+            anchor.dispatchEvent(eventObj) :
+            anchor.fireEvent('onkeydown', eventObj);
         expect(sidebarElement.hasAttribute('open')).to.be.false;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
         expect(sidebarElement.style.display).to.equal('none');
@@ -444,7 +452,11 @@ describes.realWin('amp-sidebar 0.1 version', {
         impl.open_();
         expect(sidebarElement.hasAttribute('open')).to.be.true;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        const eventObj = new Event('click', {bubbles: true, cancelable: true});
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('click', true, true);
+        }
         sandbox.stub(sidebarElement, 'getAmpDoc', () => {
           return {
             win: {
@@ -455,7 +467,9 @@ describes.realWin('amp-sidebar 0.1 version', {
             },
           };
         });
-        anchor.dispatchEvent(eventObj);
+        anchor.dispatchEvent ?
+            anchor.dispatchEvent(eventObj) :
+            anchor.fireEvent('onkeydown', eventObj);
         expect(sidebarElement.hasAttribute('open')).to.be.true;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
         expect(sidebarElement.style.display).to.equal('');
@@ -482,7 +496,11 @@ describes.realWin('amp-sidebar 0.1 version', {
         impl.open_();
         expect(sidebarElement.hasAttribute('open')).to.be.true;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        const eventObj = new Event('click', {bubbles: true, cancelable: true});
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('click', true, true);
+        }
         sandbox.stub(sidebarElement, 'getAmpDoc', () => {
           return {
             win: {
@@ -494,7 +512,9 @@ describes.realWin('amp-sidebar 0.1 version', {
             },
           };
         });
-        anchor.dispatchEvent(eventObj);
+        anchor.dispatchEvent ?
+            anchor.dispatchEvent(eventObj) :
+            anchor.fireEvent('onkeydown', eventObj);
         expect(sidebarElement.hasAttribute('open')).to.be.true;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
         expect(sidebarElement.style.display).to.equal('');
@@ -520,8 +540,14 @@ describes.realWin('amp-sidebar 0.1 version', {
         impl.open_();
         expect(sidebarElement.hasAttribute('open')).to.be.true;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        const eventObj = new Event('click', {bubbles: true, cancelable: true});
-        li.dispatchEvent(eventObj);
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('click', true, true);
+        }
+        li.dispatchEvent ?
+            li.dispatchEvent(eventObj) :
+            li.fireEvent('onkeydown', eventObj);
         expect(sidebarElement.hasAttribute('open')).to.be.true;
         expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
         expect(sidebarElement.style.display).to.equal('');

diff --git a/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js b/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
@@ -345,14 +345,16 @@
          impl.open_();
          expect(sidebarElement.hasAttribute('open')).to.be.true;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-         const eventObj = new Event(
-           'keydown',
-           {bubbles: true, cancelable: true}
-         );
+         const eventObj = document.createEventObject ?
+             document.createEventObject() : document.createEvent('Events');
+         if (eventObj.initEvent) {
+           eventObj.initEvent('keydown', true, true);
+         }
          eventObj.keyCode = KeyCodes.ESCAPE;
          eventObj.which = KeyCodes.ESCAPE;
          const el = iframe.doc.documentElement;
-         el.dispatchEvent(eventObj);
+         el.dispatchEvent ?
+             el.dispatchEvent(eventObj) : el.fireEvent('onkeydown', eventObj);
          expect(sidebarElement.hasAttribute('open')).to.be.false;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
          expect(sidebarElement.style.display).to.equal('none');
@@ -460,7 +462,11 @@
          impl.open_();
          expect(sidebarElement.hasAttribute('open')).to.be.true;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-         const eventObj = new Event('click', {bubbles: true, cancelable: true});
+         const eventObj = document.createEventObject ?
+             document.createEventObject() : document.createEvent('Events');
+         if (eventObj.initEvent) {
+           eventObj.initEvent('click', true, true);
+         }
          sandbox.stub(sidebarElement, 'getAmpDoc', () => {
            return {
              win: {
@@ -470,7 +476,9 @@
              },
            };
          });
-         anchor.dispatchEvent(eventObj);
+         anchor.dispatchEvent ?
+             anchor.dispatchEvent(eventObj) :
+             anchor.fireEvent('onkeydown', eventObj);
          expect(sidebarElement.hasAttribute('open')).to.be.false;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
          expect(sidebarElement.style.display).to.equal('none');
@@ -498,7 +506,11 @@
          impl.open_();
          expect(sidebarElement.hasAttribute('open')).to.be.true;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-         const eventObj = new Event('click', {bubbles: true, cancelable: true});
+         const eventObj = document.createEventObject ?
+             document.createEventObject() : document.createEvent('Events');
+         if (eventObj.initEvent) {
+           eventObj.initEvent('click', true, true);
+         }
          sandbox.stub(sidebarElement, 'getAmpDoc', () => {
            return {
              win: {
@@ -509,7 +521,9 @@
              },
            };
          });
-         anchor.dispatchEvent(eventObj);
+         anchor.dispatchEvent ?
+             anchor.dispatchEvent(eventObj) :
+             anchor.fireEvent('onkeydown', eventObj);
          expect(sidebarElement.hasAttribute('open')).to.be.true;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
          expect(sidebarElement.style.display).to.equal('');
@@ -536,7 +550,11 @@
          impl.open_();
          expect(sidebarElement.hasAttribute('open')).to.be.true;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-         const eventObj = new Event('click', {bubbles: true, cancelable: true});
+         const eventObj = document.createEventObject ?
+             document.createEventObject() : document.createEvent('Events');
+         if (eventObj.initEvent) {
+           eventObj.initEvent('click', true, true);
+         }
          sandbox.stub(sidebarElement, 'getAmpDoc', () => {
            return {
              win: {
@@ -548,7 +566,9 @@
              },
            };
          });
-         anchor.dispatchEvent(eventObj);
+         anchor.dispatchEvent ?
+             anchor.dispatchEvent(eventObj) :
+             anchor.fireEvent('onkeydown', eventObj);
          expect(sidebarElement.hasAttribute('open')).to.be.true;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
          expect(sidebarElement.style.display).to.equal('');
@@ -574,11 +594,14 @@
          impl.open_();
          expect(sidebarElement.hasAttribute('open')).to.be.true;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-         const eventObj = new Event(
-           'click',
-           {bubbles: true, cancelable: true}
-         );
-         li.dispatchEvent(eventObj);
+         const eventObj = document.createEventObject ?
+             document.createEventObject() : document.createEvent('Events');
+         if (eventObj.initEvent) {
+           eventObj.initEvent('click', true, true);
+         }
+         li.dispatchEvent ?
+             li.dispatchEvent(eventObj) :
+             li.fireEvent('onkeydown', eventObj);
          expect(sidebarElement.hasAttribute('open')).to.be.true;
          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
          expect(sidebarElement.style.display).to.equal('');

diff --git a/src/custom-element.js b/src/custom-element.js
@@ -1103,8 +1103,11 @@ function createBaseCustomElementClass(win) {
      */
     dispatchCustomEvent(name, opt_data) {
       const data = opt_data || {};
-      const event = new Event(name, {bubbles: true, cancelable: true});
+      // Constructors of events need to come from the correct window. Sigh.
+      const win = this.ownerDocument.defaultView;
+      const event = win.document.createEvent('Event');
       event.data = data;
+      event.initEvent(name, /* bubbles */ true, /* cancelable */ true);
       this.dispatchEvent(event);
     }
 

diff --git a/src/polyfills.js b/src/polyfills.js
@@ -16,17 +16,17 @@
 
 // Importing the document-register-element module has the side effect
 // of installing the custom elements polyfill if necessary.
-import installCustomElements
-    from 'document-register-element/build/document-register-element.node';
-import {getMode} from './mode';
-import {install as installArrayIncludes} from './polyfills/array-includes';
+import installCustomElements from
+    'document-register-element/build/document-register-element.node';
+import {
+  install as installDOMTokenListToggle,
+} from './polyfills/domtokenlist-toggle';
 import {install as installDocContains} from './polyfills/document-contains';
-import {install as installDOMTokenListToggle}
-    from './polyfills/domtokenlist-toggle';
-import {install as installEvent} from './polyfills/event';
 import {install as installMathSign} from './polyfills/math-sign';
 import {install as installObjectAssign} from './polyfills/object-assign';
 import {install as installPromise} from './polyfills/promise';
+import {install as installArrayIncludes} from './polyfills/array-includes';
+import {getMode} from './mode';
 
 /**
   Only install in closure binary and not in babel/browserify binary, since in
@@ -44,4 +44,3 @@ installObjectAssign(self);
 installPromise(self);
 installDocContains(self);
 installArrayIncludes(self);
-installEvent(self);
diff --git a/src/polyfills/event.js b/src/polyfills/event.js
diff --git a/test/functional/test-base-element.js b/test/functional/test-base-element.js
@@ -177,9 +177,11 @@ describe('BaseElement', () => {
       const timer = Services.timerFor(element.win);
       target = document.createElement('div');
 
-      event1 = new Event('event1', {bubbles: false, cancelable: true});
+      event1 = document.createEvent('Event');
+      event1.initEvent('event1', false, true);
 
-      event2 = new Event('event2', {bubbles: false, cancelable: true});
+      event2 = document.createEvent('Event');
+      event2.initEvent('event2', false, true);
 
       event1Promise = listenOncePromise(element.element, 'event1');
       event1Promise = timer.timeoutPromise(TIMEOUT, event1Promise);