Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

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, {
     },
 
     _enabled: {
-        value: null
+        value: false
     },
 
     enabled: {
@@ -61,7 +61,6 @@ exports.MenuItem = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            var boundObject = this.application.ninja, strArr = null, i=0;
 
             if(!this.data) return;
 
@@ -83,21 +82,6 @@ exports.MenuItem = Montage.create(Component, {
 
             }
 
-            if(this.data.enabled.boundProperty) {
-
-                boundObject = this.application.ninja[this.data.enabled.boundObj];
-
-                Object.defineBinding(this, "enabled", {
-                  boundObject: boundObject,
-                  boundObjectPropertyPath: this.data.enabled.boundProperty,
-                  boundValueMutator: this.data.enabled.boundValueMutator,
-                  oneway : this.data.enabled.oneway
-                });
-
-            } else {
-                this.enabled = this.data.enabled;
-            }
-
             if(this.data.submenu) {
                 this.submenu = true;