aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-16 14:37:10 -0700
committerNivesh Rajbhandari2012-05-16 14:37:10 -0700
commitffea71abfac12d99b106b5c250ec77d5f14ff88e (patch)
treee296a8b7417875569fadf98e1d273cbe17b32f14 /js/components/menu
parent96c92ab93bdb6eb2dd42ef275b84d83aef8254bf (diff)
parent99f16ae08fbb0a6dfe6008c9833f2253b18c19e5 (diff)
downloadninja-ffea71abfac12d99b106b5c250ec77d5f14ff88e.tar.gz
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
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) {