Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 7 insertions, 18 deletions

diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
index 49956f8a..f15cf119 100755
--- a/js/components/menu/menu.reel/menu.html
+++ b/js/components/menu/menu.reel/menu.html
@@ -12,7 +12,10 @@
     <script type="text/montage-serialization">
         {
             "menudata": {
-                "prototype": "js/data/menu-data"
+                "prototype": "js/data/menu-data",
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
+                }
             },
 
             "menuController": {
@@ -21,11 +24,7 @@
                     "automaticallyOrganizeObjects": false
                 },
                 "bindings": {
-                    "content": {
-                        "boundObject": {"@": "menudata"},
-                        "boundObjectPropertyPath": "topLevelMenu",
-                        "oneway": true
-                    }
+                    "content": {"<-": "@menudata.topLevelMenu"}
                 }
             },
 
@@ -44,18 +43,8 @@
                     "element": { "#": "menuItem" }
                 },
                 "bindings": {
-                    "data": {
-                        "boundObject": {"@": "repetition"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": true
-                    },
-                    "_menu": {
-                        "boundObject": {"@": "repetition"},
-                        "boundObjectPropertyPath": "menuComponent",
-                        "oneway": true
-                    }
-
-
+                    "data": {"<-": "@repetition.objectAtCurrentIteration"},
+                    "_menu": {"<-": "@repetition.menuComponent"}
                 }
             },