Merge pull request #14890 from intercom/gj/fix-#14888

[BUGFIX beta] fix #14888 with a guard
emberjs · Jan 30, 2017 · db34fc4 · db34fc4
2 parents 96c0bb7 + 75fed9b
commit db34fc4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/ember-views/lib/system/event_dispatcher.js b/packages/ember-views/lib/system/event_dispatcher.js
@@ -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);
           }
         }