aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-entry.reel/menu-entry.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 12:18:41 -0700
committerValerio Virgillito2012-07-09 12:18:41 -0700
commitb7eb5e948a911ab78461eb77a7ff1b55da2c3d8d (patch)
treedc45ebb1e9b77acad6c8062d7d0faf5658d5ba08 /js/components/menu/menu-entry.reel/menu-entry.js
parent961d9f223b279bf0f81468dca6b075e7a4be0e30 (diff)
parentcbb39c7833994c6e1db3f5b445fbedf5c70b95cc (diff)
downloadninja-b7eb5e948a911ab78461eb77a7ff1b55da2c3d8d.tar.gz
Merge pull request #371 from ananyasen/menu-bug-fix
fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up a...
Diffstat (limited to 'js/components/menu/menu-entry.reel/menu-entry.js')
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js13
1 files changed, 12 insertions, 1 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js
index 17f847d4..6c49af8f 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -102,10 +102,21 @@ exports.MenuEntry = Montage.create(Component, {
102 } 102 }
103 }, 103 },
104 104
105 toggleOnMenuItemAction: {
106 value: function() {
107 // TODO: Hack! Rework this!
108 //for non menu headers only
109 this.parentComponent.ownerComponent.toggleActivation(this);
110 }
111 },
112
105 captureMousedown: { 113 captureMousedown: {
106 value: function(event) { 114 value: function(event) {
107 // TODO: Hack! Rework this! 115 // TODO: Hack! Rework this!
108 this.parentComponent.ownerComponent.toggleActivation(this); 116 //for menu headers only
117 if(event.target.getAttribute("data-montage-id") === "topHeaderText"){
118 this.parentComponent.ownerComponent.toggleActivation(this);
119 }
109 } 120 }
110 }, 121 },
111 122