diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/components/menu/menu-item.reel | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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) { |