diff options
| author | hwc487 | 2012-05-31 17:11:08 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-31 17:11:08 -0700 |
| commit | 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch) | |
| tree | 35271ad7ffec86fde9102af3dd954fa3a2974582 /js/components/menu/menu-item.reel | |
| parent | 335ce503996e3ccbd2909086328d0a31fbd03370 (diff) | |
| parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
| download | ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'js/components/menu/menu-item.reel')
| -rwxr-xr-x | js/components/menu/menu-item.reel/menu-item.js | 2 |
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) { |