diff options
author | hwc487 | 2012-06-04 10:21:24 -0700 |
---|---|---|
committer | hwc487 | 2012-06-04 10:21:24 -0700 |
commit | 468b20e7fbc27882f8a37c83afd86d1d06c52afd (patch) | |
tree | 6c2a9c26429c4852961bdabba8f3dad45499be85 /js/components/menu/menu-item.reel/menu-item.js | |
parent | 3f5351c5d75080727953caf5d8d9a312c1c9391b (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-468b20e7fbc27882f8a37c83afd86d1d06c52afd.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/menu/menu-item.reel/menu-item.js')
-rwxr-xr-x | js/components/menu/menu-item.reel/menu-item.js | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js index fc3913b8..c00c4412 100755 --- a/js/components/menu/menu-item.reel/menu-item.js +++ b/js/components/menu/menu-item.reel/menu-item.js | |||
@@ -14,7 +14,7 @@ exports.MenuItem = Montage.create(Component, { | |||
14 | }, | 14 | }, |
15 | 15 | ||
16 | _enabled: { | 16 | _enabled: { |
17 | value: null | 17 | value: false |
18 | }, | 18 | }, |
19 | 19 | ||
20 | enabled: { | 20 | enabled: { |
@@ -61,7 +61,6 @@ exports.MenuItem = Montage.create(Component, { | |||
61 | 61 | ||
62 | prepareForDraw: { | 62 | prepareForDraw: { |
63 | value: function() { | 63 | value: function() { |
64 | var boundObject = this.application.ninja, strArr = null, i=0; | ||
65 | 64 | ||
66 | if(!this.data) return; | 65 | if(!this.data) return; |
67 | 66 | ||
@@ -83,21 +82,6 @@ exports.MenuItem = Montage.create(Component, { | |||
83 | 82 | ||
84 | } | 83 | } |
85 | 84 | ||
86 | if(this.data.enabled.boundProperty) { | ||
87 | |||
88 | boundObject = this.application.ninja[this.data.enabled.boundObj]; | ||
89 | |||
90 | Object.defineBinding(this, "enabled", { | ||
91 | boundObject: boundObject, | ||
92 | boundObjectPropertyPath: this.data.enabled.boundProperty, | ||
93 | boundValueMutator: this.data.enabled.boundValueMutator, | ||
94 | oneway : this.data.enabled.oneway | ||
95 | }); | ||
96 | |||
97 | } else { | ||
98 | this.enabled = this.data.enabled; | ||
99 | } | ||
100 | |||
101 | if(this.data.submenu) { | 85 | if(this.data.submenu) { |
102 | this.submenu = true; | 86 | this.submenu = true; |
103 | 87 | ||