Merge pull request #14820 from intercom/gj/root-element

[performance] avoid a `get` if `rootElement` is known
emberjs · Jan 12, 2017 · 5ea34e5 · 5ea34e5
2 parents e56dcbe + 6a208c2
commit 5ea34e5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/ember-views/lib/system/event_dispatcher.js b/packages/ember-views/lib/system/event_dispatcher.js
@@ -153,11 +153,13 @@ export default EmberObject.extend({
     let event;
     let events = this._finalEvents = assign({}, get(this, 'events'), addedEvents);
 
-    if (!isNone(rootElement)) {
+    if (isNone(rootElement)) {
+      rootElement = get(this, 'rootElement');
+    } else {
       set(this, 'rootElement', rootElement);
     }
 
-    rootElement = jQuery(get(this, 'rootElement'));
+    rootElement = jQuery(rootElement);
 
     assert(`You cannot use the same root element (${rootElement.selector || rootElement[0].tagName}) multiple times in an Ember.Application`, !rootElement.is(ROOT_ELEMENT_SELECTOR));
     assert('You cannot make a new Ember.Application using a root element that is a descendent of an existing Ember.Application', !rootElement.closest(ROOT_ELEMENT_SELECTOR).length);