Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

Conflicts:
	js/stage/binding-view.reel/binding-view.js

1 files changed, 5 insertions, 6 deletions

diff --git a/node_modules/montage/ui/flow.reel/flow.html b/node_modules/montage/ui/flow.reel/flow.html
index b00512cf..4d8cc16b 100644
--- a/node_modules/montage/ui/flow.reel/flow.html
+++ b/node_modules/montage/ui/flow.reel/flow.html
@@ -10,7 +10,7 @@
     <script type="text/montage-serialization">
         {
             "repetition": {
-                "prototype": "montage/ui/repetition.reel",
+                "prototype": "ui/repetition.reel",
                 "properties": {
                     "element": {
                         "#": "montage-flow-repetition"
@@ -18,7 +18,7 @@
                 }
             },
             "translateComposer": {
-                "prototype": "montage/ui/composer/translate-composer",
+                "prototype": "ui/composer/translate-composer",
                 "properties": {
                     "component": {"@": "owner"},
                     "minTranslateX": 0,
@@ -27,12 +27,10 @@
                 },
                 "bindings": {
                     "element": {"<-": "@owner._element"},
-                    "maxTranslateX": {"<-": "@owner.maxTranslateX"},
-                    "translateX": {"->": "@owner.translateX"}
+                    "maxTranslateX": {"<-": "@owner.maxTranslateX"}
                 }
             },
             "owner": {
-                "prototype": "montage/ui/flow.reel",
                 "properties": {
                     "element": {
                         "#": "montage-flow"
@@ -48,7 +46,8 @@
                     "isSelectionEnabled": {
                         "boundObject": {"@": "repetition"},
                         "boundObjectPropertyPath": "isSelectionEnabled"
-                    }
+                    },
+                    "translateX": {"<-": "@translateComposer.translateX"}
                 }
             }
         }