Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

2 files changed, 4 insertions, 27 deletions

diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html
index 5ff8c0fc..1902833a 100755
--- a/js/components/menu/menu-item.reel/menu-item.html
+++ b/js/components/menu/menu-item.reel/menu-item.html
@@ -17,11 +17,7 @@
                     "automaticallyOrganizeObjects": false
                 },
                 "bindings": {
-                    "content": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "subentries",
-                        "oneway": true
-                    }
+                    "content": {"<-": "@owner.subentries"}
                 }
             },
 
@@ -39,11 +35,8 @@
                     "element": {"#": "menuEntryItem" }
                 },
                 "bindings": {
-                    "data": {
-                        "boundObject": {"@": "repetition"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": true
-                    }
+                    "data": {"<-": "@repetition.objectAtCurrentIteration"},
+                    "enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"}
                 }
             },
 
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;