Fix node: EventDispatcher references document global

emberjs · Feb 26, 2021 · 9973c42 · 9973c42
1 parent 97bd0a2
commit 9973c42
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -121,18 +121,8 @@ export default EmberObject.extend({
 
   init() {
     this._super();
-
-    assert(
-      'EventDispatcher should never be instantiated in fastboot mode. Please report this as an Ember bug.',
-      (() => {
-        let owner = getOwner(this);
-        let environment = owner.lookup('-environment:main');
-
-        return environment.isInteractive;
-      })()
-    );
-
     this._eventHandlers = Object.create(null);
+    this._didSetup = false;
   },
 
   /**
@@ -148,6 +138,16 @@ export default EmberObject.extend({
     @param addedEvents {Object}
   */
   setup(addedEvents, _rootElement) {
+    assert(
+      'EventDispatcher should never be setup in fastboot mode. Please report this as an Ember bug.',
+      (() => {
+        let owner = getOwner(this);
+        let environment = owner.lookup('-environment:main');
+
+        return environment.isInteractive;
+      })()
+    );
+
     let events = (this._finalEvents = assign({}, get(this, 'events'), addedEvents));
 
     if (_rootElement !== undefined && _rootElement !== null) {
@@ -230,6 +230,8 @@ export default EmberObject.extend({
         this.setupHandler(rootElement, event, events[event]);
       }
     }
+
+    this._didSetup = true;
   },
 
   /**
@@ -432,6 +434,10 @@ export default EmberObject.extend({
   },
 
   destroy() {
+    if (this._didSetup === false) {
+      return;
+    }
+
     let rootElementSelector = get(this, 'rootElement');
     let rootElement;
     if (rootElementSelector.nodeType) {