diff options
author | Jose Antonio Marquez | 2012-05-16 15:42:37 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-16 15:42:37 -0700 |
commit | 857aafee732b6a85fa155ff4a05d1b8fde48f09d (patch) | |
tree | e06d330caee280aa05aec46391979e9abdcf974c /node_modules/montage/ui/flow.reel/flow.html | |
parent | 5cc5d29736d8bf253e3a168cdd6443e839ffb23c (diff) | |
parent | fd54dabad7cbc27a0efb0957155c00d578912909 (diff) | |
download | ninja-857aafee732b6a85fa155ff4a05d1b8fde48f09d.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'node_modules/montage/ui/flow.reel/flow.html')
-rw-r--r-- | node_modules/montage/ui/flow.reel/flow.html | 10 |
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 @@ | |||
21 | "prototype": "montage/ui/composer/translate-composer", | 21 | "prototype": "montage/ui/composer/translate-composer", |
22 | "properties": { | 22 | "properties": { |
23 | "component": {"@": "owner"}, | 23 | "component": {"@": "owner"}, |
24 | "maxTranslateX": 250000, | 24 | "minTranslateX": 0, |
25 | "invertAxis": true | 25 | "invertAxis": true, |
26 | "allowFloats": true | ||
26 | }, | 27 | }, |
27 | "bindings": { | 28 | "bindings": { |
28 | "element": {"<-": "@owner._element"} | 29 | "element": {"<-": "@owner._element"}, |
30 | "maxTranslateX": {"<-": "@owner.maxTranslateX"}, | ||
31 | "translateX": {"->": "@owner.translateX"} | ||
29 | } | 32 | } |
30 | }, | 33 | }, |
31 | "owner": { | 34 | "owner": { |
@@ -42,7 +45,6 @@ | |||
42 | } | 45 | } |
43 | }, | 46 | }, |
44 | "bindings": { | 47 | "bindings": { |
45 | "translateX": {"<-": "@translateComposer.translateX"}, | ||
46 | "isSelectionEnabled": { | 48 | "isSelectionEnabled": { |
47 | "boundObject": {"@": "repetition"}, | 49 | "boundObject": {"@": "repetition"}, |
48 | "boundObjectPropertyPath": "isSelectionEnabled" | 50 | "boundObjectPropertyPath": "isSelectionEnabled" |