diff options
author | Jon Reid | 2012-06-15 10:10:41 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
tree | 65939e59615aaa10a7db77211e71616ad531bd0e /node_modules/montage/ui/flow.reel/flow.html | |
parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'node_modules/montage/ui/flow.reel/flow.html')
-rw-r--r-- | node_modules/montage/ui/flow.reel/flow.html | 11 |
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 @@ | |||
10 | <script type="text/montage-serialization"> | 10 | <script type="text/montage-serialization"> |
11 | { | 11 | { |
12 | "repetition": { | 12 | "repetition": { |
13 | "prototype": "montage/ui/repetition.reel", | 13 | "prototype": "ui/repetition.reel", |
14 | "properties": { | 14 | "properties": { |
15 | "element": { | 15 | "element": { |
16 | "#": "montage-flow-repetition" | 16 | "#": "montage-flow-repetition" |
@@ -18,7 +18,7 @@ | |||
18 | } | 18 | } |
19 | }, | 19 | }, |
20 | "translateComposer": { | 20 | "translateComposer": { |
21 | "prototype": "montage/ui/composer/translate-composer", | 21 | "prototype": "ui/composer/translate-composer", |
22 | "properties": { | 22 | "properties": { |
23 | "component": {"@": "owner"}, | 23 | "component": {"@": "owner"}, |
24 | "minTranslateX": 0, | 24 | "minTranslateX": 0, |
@@ -27,12 +27,10 @@ | |||
27 | }, | 27 | }, |
28 | "bindings": { | 28 | "bindings": { |
29 | "element": {"<-": "@owner._element"}, | 29 | "element": {"<-": "@owner._element"}, |
30 | "maxTranslateX": {"<-": "@owner.maxTranslateX"}, | 30 | "maxTranslateX": {"<-": "@owner.maxTranslateX"} |
31 | "translateX": {"->": "@owner.translateX"} | ||
32 | } | 31 | } |
33 | }, | 32 | }, |
34 | "owner": { | 33 | "owner": { |
35 | "prototype": "montage/ui/flow.reel", | ||
36 | "properties": { | 34 | "properties": { |
37 | "element": { | 35 | "element": { |
38 | "#": "montage-flow" | 36 | "#": "montage-flow" |
@@ -48,7 +46,8 @@ | |||
48 | "isSelectionEnabled": { | 46 | "isSelectionEnabled": { |
49 | "boundObject": {"@": "repetition"}, | 47 | "boundObject": {"@": "repetition"}, |
50 | "boundObjectPropertyPath": "isSelectionEnabled" | 48 | "boundObjectPropertyPath": "isSelectionEnabled" |
51 | } | 49 | }, |
50 | "translateX": {"<-": "@translateComposer.translateX"} | ||
52 | } | 51 | } |
53 | } | 52 | } |
54 | } | 53 | } |