Applied suggested fixes.

daytonjallen · daytonjallen · commit 7bce131ba8cf · 2016-09-10T14:44:44.000-05:00
diff --git a/src/command/Menus.js b/src/command/Menus.js
@@ -182,13 +182,13 @@ define(function (require, exports, module) {
     * Removes the attached event listeners from the corresponding object.
     * @param {Command} command
     */
-    function removeMenuItemEventListeners(command) {
-        command
-            .off("enabledStateChange", command._enabledChanged)
-            .off("checkedStateChange", command._checkedChanged)
-            .off("nameChange", command._nameChanged)
-            .off("keyBindingAdded", command._keyBindingAdded)
-            .off("keyBindingRemoved", command._keyBindingRemoved);
+    function removeMenuItemEventListeners(menuItem) {
+        menuItem._command
+            .off("enabledStateChange", menuItem._enabledChanged)
+            .off("checkedStateChange", menuItem._checkedChanged)
+            .off("nameChange", menuItem._nameChanged)
+            .off("keyBindingAdded", menuItem._keyBindingAdded)
+            .off("keyBindingRemoved", menuItem._keyBindingRemoved);
     }
 
     /**
@@ -457,14 +457,15 @@ define(function (require, exports, module) {
                 console.error("removeMenuItem(): command not found: " + command);
                 return;
             }
-            removeMenuItemEventListeners(commandObj);
             commandID = command;
         } else {
-            removeMenuItemEventListeners(command);
             commandID = command.getID();
         }
         menuItemID = this._getMenuItemId(commandID);
 
+        var menuItem = getMenuItem(menuItemID);
+        removeMenuItemEventListeners(menuItem);
+
         if (_isHTMLMenu(this.id)) {
             // Targeting parent to get the menu item <a> and the <li> that contains it
             $(_getHTMLMenuItem(menuItemID)).parent().remove();
diff --git a/test/spec/Menu-test.js b/test/spec/Menu-test.js
@@ -746,21 +746,25 @@ define(function (require, exports, module) {
                     var menuItem = menu.addMenuItem(commandId);
 
                     var command = CommandManager.get(commandId);
+                    command.on("testEvent", function () {});
 
                     expect(typeof (command._eventHandlers.enabledStateChange)).toBe("object");
                     expect(typeof (command._eventHandlers.checkedStateChange)).toBe("object");
                     expect(typeof (command._eventHandlers.nameChange)).toBe("object");
                     expect(typeof (command._eventHandlers.keyBindingAdded)).toBe("object");
                     expect(typeof (command._eventHandlers.keyBindingRemoved)).toBe("object");
+                    expect(typeof (command._eventHandlers.testEvent)).toBe("object");
 
                     menu.removeMenuItem(command);
 
                     // Check if attached events have been removed
                     expect(command._eventHandlers.nameChange).toBeUndefined();
                     expect(command._eventHandlers.checkedStateChange).toBeUndefined();
-                    expect(command._eventHandlers.KeyBindingAdded).toBeUndefined();
+                    expect(command._eventHandlers.keyBindingAdded).toBeUndefined();
                     expect(command._eventHandlers.keyBindingRemoved).toBeUndefined();
                     expect(command._eventHandlers.enabledStateChange).toBeUndefined();
+                    expect(typeof (command._eventHandlers.testEvent)).toBe("object");
+
                 });
             });
         });
