diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /js/components/menu/menu-item.reel/menu-item.js | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/menu/menu-item.reel/menu-item.js')
| -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) { |