Merge branch 'master' into pentool

1 files changed, 6 insertions, 4 deletions

diff --git a/node_modules/montage/ui/flow.reel/flow.html b/node_modules/montage/ui/flow.reel/flow.html
index 8a9603bf..b00512cf 100644
--- a/node_modules/montage/ui/flow.reel/flow.html
+++ b/node_modules/montage/ui/flow.reel/flow.html
@@ -21,11 +21,14 @@
                 "prototype": "montage/ui/composer/translate-composer",
                 "properties": {
                     "component": {"@": "owner"},
-                    "maxTranslateX": 250000,
-                    "invertAxis": true
+                    "minTranslateX": 0,
+                    "invertAxis": true,
+                    "allowFloats": true
                 },
                 "bindings": {
-                    "element": {"<-": "@owner._element"}
+                    "element": {"<-": "@owner._element"},
+                    "maxTranslateX": {"<-": "@owner.maxTranslateX"},
+                    "translateX": {"->": "@owner.translateX"}
                 }
             },
             "owner": {
@@ -42,7 +45,6 @@
                     }
                 },
                 "bindings": {
-                    "translateX": {"<-": "@translateComposer.translateX"},
                     "isSelectionEnabled": {
                         "boundObject": {"@": "repetition"},
                         "boundObjectPropertyPath": "isSelectionEnabled"