From 6a208c285f61755560ea19ff1af90cd63f81e2a2 Mon Sep 17 00:00:00 2001 From: Gavin Joyce Date: Thu, 12 Jan 2017 10:26:55 +0000 Subject: [PATCH] [BUGFIX beta] avoid a `get` if `rootElement` is known --- packages/ember-views/lib/system/event_dispatcher.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/ember-views/lib/system/event_dispatcher.js b/packages/ember-views/lib/system/event_dispatcher.js index 7b2f855ede3..accbf1e65f0 100644 --- 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);