remove arrays from registeredActions map

emberjs · Jan 24, 2017 · 6107018 · 6107018
1 parent e39b79e
commit 6107018
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/packages/ember-glimmer/lib/modifiers/action.js b/packages/ember-glimmer/lib/modifiers/action.js
@@ -38,34 +38,16 @@ export let ActionHelper = {
 
   registerAction(actionState) {
     let { actionId } = actionState;
-    let actions = ActionManager.registeredActions[actionId];
 
-    if (!actions) {
-      actions = ActionManager.registeredActions[actionId] = [];
-    }
-
-    actions.push(actionState);
+    ActionManager.registeredActions[actionId] = actionState;
 
     return actionId;
   },
 
   unregisterAction(actionState) {
     let { actionId } = actionState;
-    let actions = ActionManager.registeredActions[actionId];
-
-    if (!actions) {
-      return;
-    }
 
-    let index = actions.indexOf(actionState);
-
-    if (index !== -1) {
-      actions.splice(index, 1);
-    }
-
-    if (actions.length === 0) {
-      delete ActionManager.registeredActions[actionId];
-    }
+    delete ActionManager.registeredActions[actionId];
   }
 };
 

diff --git a/packages/ember-views/lib/system/event_dispatcher.js b/packages/ember-views/lib/system/event_dispatcher.js
@@ -219,15 +219,13 @@ export default EmberObject.extend({
 
     rootElement.on(`${event}.ember`, '[data-ember-action]', evt => {
       let attributes = evt.currentTarget.attributes;
-      let attributeCount = attributes.length;
 
-      for (let i = 0; i < attributeCount; i++) {
+      for (let i = 0; i < attributes.length; i++) {
         let attr = attributes.item(i);
         let attrName = attr.name;
 
         if (attrName.indexOf('data-ember-action-') === 0) {
-          //TODO: GJ: why does `registeredActions` contains arrays? are they always of length 1?
-          let action = ActionManager.registeredActions[attr.value][0];
+          let action = ActionManager.registeredActions[attr.value];
 
           if (action && action.eventName === eventName) {
             action.handler(evt);