aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 12:20:03 -0700
committerPushkar Joshi2012-05-31 12:20:03 -0700
commit4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch)
treec5b17297aba04bd54a59cf6214d29486e089031b /js/components/menu
parent75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/menu')
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index 26fc7573..fc3913b8 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -141,7 +141,7 @@ exports.MenuItem = Montage.create(Component, {
141 141
142 if(this.data.radio && this.checked) return; 142 if(this.data.radio && this.checked) return;
143 143
144 if((this.enabled === true) && (this.submenu === false) ) { 144 if( ( this.enabled === true || this.enabled > 0 ) && (this.submenu === false) ) {
145 if(this.data.action) { 145 if(this.data.action) {
146 NJevent ( this.data.action ); 146 NJevent ( this.data.action );
147 } else if(this.checked !== null) { 147 } else if(this.checked !== null) {