diff options
author | Armen Kesablyan | 2012-06-20 15:04:25 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:04:25 -0700 |
commit | fc818d31de267d2b77fda3b3029ad38d48698be8 (patch) | |
tree | 122ebf54d3378578c1ded4d786ba3940d4a911d2 /node_modules/montage/ui/scroller.reel | |
parent | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-fc818d31de267d2b77fda3b3029ad38d48698be8.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'node_modules/montage/ui/scroller.reel')
-rw-r--r-- | node_modules/montage/ui/scroller.reel/scroller.css | 15 | ||||
-rw-r--r-- | node_modules/montage/ui/scroller.reel/scroller.html | 132 |
2 files changed, 76 insertions, 71 deletions
diff --git a/node_modules/montage/ui/scroller.reel/scroller.css b/node_modules/montage/ui/scroller.reel/scroller.css new file mode 100644 index 00000000..0966ad8e --- /dev/null +++ b/node_modules/montage/ui/scroller.reel/scroller.css | |||
@@ -0,0 +1,15 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | .montage-scroller { | ||
8 | position: relative; | ||
9 | display: block; | ||
10 | overflow: hidden; | ||
11 | } | ||
12 | .montage-scroller .content { | ||
13 | float: left; | ||
14 | width: 100%; | ||
15 | } \ No newline at end of file | ||
diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html index 0b525746..a897faf8 100644 --- a/node_modules/montage/ui/scroller.reel/scroller.html +++ b/node_modules/montage/ui/scroller.reel/scroller.html | |||
@@ -5,81 +5,71 @@ | |||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html> | 7 | <html> |
8 | <head> | 8 | <head> |
9 | <title></title> | 9 | <meta charset="utf-8"> |
10 | <script type="text/montage-serialization">{ | 10 | <link rel="stylesheet" href="scroller.css"> |
11 | 11 | <script type="text/montage-serialization"> | |
12 | "scrollbars": { | 12 | { |
13 | "prototype": "ui/scroll-bars.reel", | 13 | "scrollbars": { |
14 | "properties": { | 14 | "prototype": "ui/scroll-bars.reel", |
15 | "element": { | 15 | "properties": { |
16 | "#": "scrollbars" | 16 | "element": { |
17 | } | 17 | "#": "scrollbars" |
18 | } | 18 | } |
19 | } | ||
20 | }, | ||
21 | "translateComposer1": { | ||
22 | "prototype": "ui/composer/translate-composer", | ||
23 | "properties": { | ||
24 | "component": {"@": "owner"}, | ||
25 | "minTranslateX": 0, | ||
26 | "minTranslateY": 0, | ||
27 | "invertAxis": true | ||
28 | }, | ||
29 | "bindings": { | ||
30 | "translateX": {"<->": "@owner.scrollX"}, | ||
31 | "translateY": {"<->": "@owner.scrollY"}, | ||
32 | "maxTranslateX": {"<-": "@owner._maxTranslateX"}, | ||
33 | "maxTranslateY": {"<-": "@owner._maxTranslateY"}, | ||
34 | "axis": {"<-": "@owner.axis"}, | ||
35 | "hasMomentum": {"<-": "@owner.hasMomentum"} | ||
36 | }, | ||
37 | "listeners": [ | ||
38 | { | ||
39 | "type": "translateStart", | ||
40 | "listener": {"@": "owner"} | ||
19 | }, | 41 | }, |
20 | "translateComposer1": { | 42 | { |
21 | "prototype": "ui/composer/translate-composer", | 43 | "type": "translateEnd", |
22 | "properties": { | 44 | "listener": {"@": "owner"} |
23 | "component": {"@": "owner"}, | 45 | } |
24 | "minTranslateX": 0, | 46 | ] |
25 | "minTranslateY": 0, | 47 | }, |
26 | "invertAxis": true | 48 | "slot": { |
27 | }, | 49 | "prototype": "ui/slot.reel", |
28 | "bindings": { | 50 | "properties": { |
29 | "translateX": {"<->": "@owner.scrollX"}, | 51 | "element": {"#": "content"} |
30 | "translateY": {"<->": "@owner.scrollY"}, | 52 | }, |
31 | "maxTranslateX": {"<-": "@owner._maxTranslateX"}, | 53 | "bindings": { |
32 | "maxTranslateY": {"<-": "@owner._maxTranslateY"}, | 54 | "domContent": {"<-": "@owner.domContent"} |
33 | "axis": {"<-": "@owner.axis"}, | 55 | } |
34 | "hasMomentum": {"<-": "@owner.hasMomentum"} | 56 | }, |
35 | }, | 57 | "owner": { |
36 | "listeners": [ | 58 | "prototype": "ui/scroller.reel", |
37 | { | 59 | "properties": { |
38 | "type": "translateStart", | 60 | "_content": { |
39 | "listener": {"@": "owner"} | 61 | "#": "content" |
40 | }, | ||
41 | { | ||
42 | "type": "translateEnd", | ||
43 | "listener": {"@": "owner"} | ||
44 | } | ||
45 | ] | ||
46 | }, | 62 | }, |
47 | "slot": { | 63 | "element": { |
48 | "prototype": "ui/slot.reel", | 64 | "#": "montage-scroller" |
49 | "properties": { | ||
50 | "element": {"#": "content"} | ||
51 | }, | ||
52 | "bindings": { | ||
53 | "domContent": {"<-": "@owner.domContent"} | ||
54 | } | ||
55 | }, | 65 | }, |
56 | "owner": { | 66 | "_scrollBars": { |
57 | "prototype": "ui/scroller.reel", | 67 | "@": "scrollbars" |
58 | "properties": { | ||
59 | "_content": { | ||
60 | "#": "content" | ||
61 | }, | ||
62 | "element": { | ||
63 | "#": "montage-scroller" | ||
64 | }, | ||
65 | "_scrollBars": { | ||
66 | "@": "scrollbars" | ||
67 | } | ||
68 | } | ||
69 | } | 68 | } |
70 | |||
71 | }</script> | ||
72 | <style> | ||
73 | .montage-scroller { | ||
74 | position: relative; | ||
75 | display: block; | ||
76 | overflow: hidden; | ||
77 | } | ||
78 | .montage-scroller .content { | ||
79 | float: left; | ||
80 | width: 100%; | ||
81 | } | 69 | } |
82 | </style> | 70 | } |
71 | } | ||
72 | </script> | ||
83 | </head> | 73 | </head> |
84 | <body> | 74 | <body> |
85 | <div data-montage-id="montage-scroller" class="montage-scroller"> | 75 | <div data-montage-id="montage-scroller" class="montage-scroller"> |
@@ -87,4 +77,4 @@ | |||
87 | <div data-montage-id="content" class="content"></div> | 77 | <div data-montage-id="content" class="content"></div> |
88 | </div> | 78 | </div> |
89 | </body> | 79 | </body> |
90 | </html> | 80 | </html> \ No newline at end of file |