diff options
author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /node_modules/montage/ui/scroller.reel/scroller.html | |
parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/scroller.reel/scroller.html')
-rwxr-xr-x | node_modules/montage/ui/scroller.reel/scroller.html | 59 |
1 files changed, 58 insertions, 1 deletions
diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html index 00a85a88..34e4bc0a 100755 --- a/node_modules/montage/ui/scroller.reel/scroller.html +++ b/node_modules/montage/ui/scroller.reel/scroller.html | |||
@@ -18,6 +18,63 @@ | |||
18 | } | 18 | } |
19 | } | 19 | } |
20 | }, | 20 | }, |
21 | "translateComposer1": { | ||
22 | "module": "montage/ui/composer/translate-composer", | ||
23 | "name": "TranslateComposer", | ||
24 | "properties": { | ||
25 | "component": {"@": "owner"} | ||
26 | }, | ||
27 | "bindings": { | ||
28 | "translateX": { | ||
29 | "boundObject": {"@": "owner"}, | ||
30 | "boundObjectPropertyPath": "scrollX", | ||
31 | "oneway": false | ||
32 | }, | ||
33 | "translateY": { | ||
34 | "boundObject": {"@": "owner"}, | ||
35 | "boundObjectPropertyPath": "scrollY", | ||
36 | "oneway": false | ||
37 | }, | ||
38 | "maxTranslateY": { | ||
39 | "boundObject": {"@": "owner"}, | ||
40 | "boundObjectPropertyPath": "_maxTranslateY" | ||
41 | }, | ||
42 | "maxTranslateX": { | ||
43 | "boundObject": {"@": "owner"}, | ||
44 | "boundObjectPropertyPath": "_maxTranslateX" | ||
45 | }, | ||
46 | "axis": { | ||
47 | "boundObject": {"@": "owner"}, | ||
48 | "boundObjectPropertyPath": "axis" | ||
49 | }, | ||
50 | "hasBouncing": { | ||
51 | "boundObject": {"@": "owner"}, | ||
52 | "boundObjectPropertyPath": "hasBouncing" | ||
53 | }, | ||
54 | "hasMomentum": { | ||
55 | "boundObject": {"@": "owner"}, | ||
56 | "boundObjectPropertyPath": "hasMomentum" | ||
57 | }, | ||
58 | "bouncingDuration": { | ||
59 | "boundObject": {"@": "owner"}, | ||
60 | "boundObjectPropertyPath": "bouncingDuration" | ||
61 | }, | ||
62 | "momentumDuration": { | ||
63 | "boundObject": {"@": "owner"}, | ||
64 | "boundObjectPropertyPath": "momentumDuration" | ||
65 | } | ||
66 | }, | ||
67 | "listeners": [ | ||
68 | { | ||
69 | "type": "translateStart", | ||
70 | "listener": {"@": "owner"} | ||
71 | }, | ||
72 | { | ||
73 | "type": "translateEnd", | ||
74 | "listener": {"@": "owner"} | ||
75 | } | ||
76 | ] | ||
77 | }, | ||
21 | "owner": { | 78 | "owner": { |
22 | "module": "montage/ui/scroller.reel", | 79 | "module": "montage/ui/scroller.reel", |
23 | "name": "Scroller", | 80 | "name": "Scroller", |
@@ -52,4 +109,4 @@ | |||
52 | <div id="content" class="content"></div> | 109 | <div id="content" class="content"></div> |
53 | </div> | 110 | </div> |
54 | </body> | 111 | </body> |
55 | </html> \ No newline at end of file | 112 | </html> |