diff options
| author | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
| commit | 8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch) | |
| tree | 19a8af74c58c9ea261f0842f36efdab959be3256 /js/components/menu | |
| parent | eea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff) | |
| parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
| download | ninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz | |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/components/menu')
| -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) { |