aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-item.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-03-28 14:21:35 -0700
committerAnanya Sen2012-03-28 14:21:35 -0700
commit2c794eca1b01743b0221af4341835d3608185dd3 (patch)
tree96c3bedfc5afe4b12ad0c3b261dda493c80fb3c1 /js/components/menu/menu-item.reel
parent0d83ad4dc08448e016c79ae739e84c3d71552b56 (diff)
parent3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff)
downloadninja-2c794eca1b01743b0221af4341835d3608185dd3.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Codeview-improvements
Diffstat (limited to 'js/components/menu/menu-item.reel')
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js13
1 files changed, 10 insertions, 3 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index 64a89a6a..26fc7573 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -61,6 +61,8 @@ 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 if(!this.data) return; 66 if(!this.data) return;
65 67
66 if(this.data.separator) { 68 if(this.data.separator) {
@@ -82,9 +84,14 @@ exports.MenuItem = Montage.create(Component, {
82 } 84 }
83 85
84 if(this.data.enabled.boundProperty) { 86 if(this.data.enabled.boundProperty) {
87
88 boundObject = this.application.ninja[this.data.enabled.boundObj];
89
85 Object.defineBinding(this, "enabled", { 90 Object.defineBinding(this, "enabled", {
86 boundObject: this.application.ninja[this.data.enabled.boundObj], 91 boundObject: boundObject,
87 boundObjectPropertyPath: this.data.enabled.boundProperty 92 boundObjectPropertyPath: this.data.enabled.boundProperty,
93 boundValueMutator: this.data.enabled.boundValueMutator,
94 oneway : this.data.enabled.oneway
88 }); 95 });
89 96
90 } else { 97 } else {
@@ -134,7 +141,7 @@ exports.MenuItem = Montage.create(Component, {
134 141
135 if(this.data.radio && this.checked) return; 142 if(this.data.radio && this.checked) return;
136 143
137 if(this.enabled || !this.submenu) { 144 if((this.enabled === true) && (this.submenu === false) ) {
138 if(this.data.action) { 145 if(this.data.action) {
139 NJevent ( this.data.action ); 146 NJevent ( this.data.action );
140 } else if(this.checked !== null) { 147 } else if(this.checked !== null) {