Skip to content

Commit

Permalink
Merge pull request emberjs#14890 from intercom/gj/fix-#14888
Browse files Browse the repository at this point in the history
[BUGFIX beta] fix emberjs#14888 with a guard
  • Loading branch information
rwjblue authored Jan 30, 2017
2 parents 96c0bb7 + 75fed9b commit db34fc4
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion packages/ember-views/lib/system/event_dispatcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,10 @@ export default EmberObject.extend({
if (attrName.lastIndexOf('data-ember-action-', 0) !== -1) {
let action = ActionManager.registeredActions[attr.value];

if (action.eventName === eventName) {
// We have to check for action here since in some cases, jQuery will trigger
// an event on `removeChild` (i.e. focusout) after we've already torn down the
// action handlers for the view.
if (action && action.eventName === eventName) {
action.handler(evt);
}
}
Expand Down

0 comments on commit db34fc4

Please sign in to comment.