diff --git a/packages/ember-metal/lib/events.js b/packages/ember-metal/lib/events.js index e8f20bf56f4..6f609b9bb39 100644 --- a/packages/ember-metal/lib/events.js +++ b/packages/ember-metal/lib/events.js @@ -206,7 +206,7 @@ export function sendEvent(obj, eventName, params, actions) { actions = meta && meta.matchingListeners(eventName); } - if (!actions) { return; } + if (!actions || actions.length === 0) { return; } for (var i = actions.length - 3; i >= 0; i -= 3) { // looping in reverse for once listeners var target = actions[i]; diff --git a/packages/ember-metal/lib/meta.js b/packages/ember-metal/lib/meta.js index 44e00bbd5df..1c7a395ebdb 100644 --- a/packages/ember-metal/lib/meta.js +++ b/packages/ember-metal/lib/meta.js @@ -44,12 +44,16 @@ let members = { }; let memberNames = Object.keys(members); -let memberProperties = memberNames.map(memberProperty); function Meta(obj, parentMeta) { - // preallocate a slot for each member - memberProperties.forEach(prop => this[prop] = undefined); - + this.cache = undefined; + this.watching = undefined; + this.mixins = undefined; + this.bindings = undefined; + this.values = undefined; + this.deps = undefined; + this.chainWatchers = undefined; + this.chains = undefined; // used only internally this.source = obj; diff --git a/packages/ember-views/lib/views/component.js b/packages/ember-views/lib/views/component.js index 7cf2539b34a..5767947860f 100644 --- a/packages/ember-views/lib/views/component.js +++ b/packages/ember-views/lib/views/component.js @@ -171,7 +171,7 @@ var Component = View.extend(TargetActionSupport, ComponentTemplateDeprecation, { _template: computed('templateName', { get() { - if (get(this, '_deprecatedFlagForBlockProvided')) { + if (this._deprecatedFlagForBlockProvided) { return true; } var templateName = get(this, 'templateName');