diff options
Diffstat (limited to 'node_modules/montage/ui/picasa-carousel.reel')
3 files changed, 31 insertions, 52 deletions
diff --git a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html index 1e94f43b..3e88adc0 100644 --- a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html +++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html | |||
@@ -20,14 +20,17 @@ | |||
20 | </head> | 20 | </head> |
21 | <style> | 21 | <style> |
22 | .Image { | 22 | .Image { |
23 | /* | 23 | position: absolute; |
24 | margin-top: -160px; | 24 | top: 50%; |
25 | margin-left: -160px; | 25 | left: 50%; |
26 | */ | 26 | margin-top: -72px; |
27 | width: 320px; | 27 | margin-left: -105px; |
28 | height: 320px; | 28 | width: 206px; |
29 | border-radius: 18px; | 29 | height: 140px; |
30 | border-radius: 4px; | ||
31 | border: 2px solid #888; | ||
30 | background-repeat: no-repeat; | 32 | background-repeat: no-repeat; |
33 | background-position: center center; | ||
31 | background-size: cover; | 34 | background-size: cover; |
32 | } | 35 | } |
33 | </style> | 36 | </style> |
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html index fdb452d7..34f207b4 100755 --- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html +++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html | |||
@@ -15,7 +15,8 @@ | |||
15 | "prototype": "montage/ui/picasa-carousel.reel", | 15 | "prototype": "montage/ui/picasa-carousel.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "montage-google-picasa-carousel"}, | 17 | "element": {"#": "montage-google-picasa-carousel"}, |
18 | "searchResultsList": {"@": "searchResultsList"} | 18 | "searchResultsList": {"@": "searchResultsList"}, |
19 | "flow": {"@": "flow1"} | ||
19 | } | 20 | } |
20 | }, | 21 | }, |
21 | "searchResultsController": { | 22 | "searchResultsController": { |
@@ -83,7 +84,7 @@ | |||
83 | "cameraRotationAxisX": 1, | 84 | "cameraRotationAxisX": 1, |
84 | "cameraRotationAxisY": 0, | 85 | "cameraRotationAxisY": 0, |
85 | "cameraRotationAxisZ": 0, | 86 | "cameraRotationAxisZ": 0, |
86 | "scale": 380 | 87 | "scale": 210 |
87 | }, | 88 | }, |
88 | "bindings": { | 89 | "bindings": { |
89 | "objects": { | 90 | "objects": { |
@@ -92,8 +93,8 @@ | |||
92 | "oneway": true | 93 | "oneway": true |
93 | }, | 94 | }, |
94 | "path": { | 95 | "path": { |
95 | "boundObject": {"@": "pathLerp1"}, | 96 | "boundObject": {"@": "path2"}, |
96 | "boundObjectPropertyPath": "resultPath", | 97 | "boundObjectPropertyPath": "path", |
97 | "oneway": true | 98 | "oneway": true |
98 | }, | 99 | }, |
99 | "cameraRotationAngle": { | 100 | "cameraRotationAngle": { |
@@ -113,20 +114,6 @@ | |||
113 | } | 114 | } |
114 | } | 115 | } |
115 | }, | 116 | }, |
116 | "path1": { | ||
117 | "module": "montage/ui/flow-path", | ||
118 | "name": "FlowPath", | ||
119 | "properties": { | ||
120 | "evalPath": [ | ||
121 | "path.translateX = slide.time-slide.index*155+50", | ||
122 | "path.translateY = (slide.index%3)*240", | ||
123 | "path.translateZ = -slide.time/3", | ||
124 | "path.rotateX = slide.speed/200", | ||
125 | "path.rotateY = 1", | ||
126 | "path.rotateZ = slide.time/500" | ||
127 | ] | ||
128 | } | ||
129 | }, | ||
130 | "path2": { | 117 | "path2": { |
131 | "module": "montage/ui/flow-path", | 118 | "module": "montage/ui/flow-path", |
132 | "name": "FlowPath", | 119 | "name": "FlowPath", |
@@ -134,35 +121,12 @@ | |||
134 | "evalPath": [ | 121 | "evalPath": [ |
135 | "path.translateX = slide.time", | 122 | "path.translateX = slide.time", |
136 | "path.translateY = 0", | 123 | "path.translateY = 0", |
137 | "path.translateZ = slide.time*slide.time/-1500", | 124 | "path.translateZ = Math.pow(1.1, -slide.time*slide.time/30000)*600-600", |
138 | "path.rotateX = 0", | 125 | "path.rotateX = 0", |
139 | "path.rotateY = slide.time/1200", | 126 | "path.rotateY = 0", |
140 | "path.rotateZ = slide.speed/1500" | 127 | "path.rotateZ = slide.speed/1500" |
141 | ] | 128 | ] |
142 | } | 129 | } |
143 | }, | ||
144 | "pathLerp1": { | ||
145 | "module": "montage/ui/flow-path-lerp", | ||
146 | "name": "FlowPathLerp", | ||
147 | "properties": { | ||
148 | "interpolant": 1 | ||
149 | }, | ||
150 | "bindings": { | ||
151 | "path1": { | ||
152 | "boundObject": {"@": "path1"}, | ||
153 | "boundObjectPropertyPath": "path", | ||
154 | "oneway": true | ||
155 | }, | ||
156 | "path2": { | ||
157 | "boundObject": {"@": "path2"}, | ||
158 | "boundObjectPropertyPath": "path", | ||
159 | "oneway": true | ||
160 | }, | ||
161 | "interpolant": { | ||
162 | "boundObject": {"@": "slider1"}, | ||
163 | "boundObjectPropertyPath": "value" | ||
164 | } | ||
165 | } | ||
166 | } | 130 | } |
167 | 131 | ||
168 | } | 132 | } |
@@ -172,7 +136,7 @@ | |||
172 | <body> | 136 | <body> |
173 | 137 | ||
174 | <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel"> | 138 | <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel"> |
175 | <div id="flow" class="flow"> | 139 | <div id="flow" class="flow" style="-webkit-perspective: 1400px; -webkit-transform-style: preserve-3d; width:800px; height:160px; border:1px;"> |
176 | <img id="image" class="image"/> | 140 | <img id="image" class="image"/> |
177 | </div> | 141 | </div> |
178 | </div> | 142 | </div> |
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js index 1f5e7dd0..b41df9a6 100644 --- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js +++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js | |||
@@ -20,6 +20,16 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len | |||
20 | value: null | 20 | value: null |
21 | }, | 21 | }, |
22 | 22 | ||
23 | flow: { | ||
24 | value: null | ||
25 | }, | ||
26 | |||
27 | initialPosition: { | ||
28 | value: 2300 | ||
29 | }, | ||
30 | |||
31 | |||
32 | |||
23 | _queryParameter: { | 33 | _queryParameter: { |
24 | enumerable: false, | 34 | enumerable: false, |
25 | value: null | 35 | value: null |
@@ -37,7 +47,7 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len | |||
37 | 47 | ||
38 | resultCount: { | 48 | resultCount: { |
39 | enumerable: false, | 49 | enumerable: false, |
40 | value: 20 | 50 | value: 40 |
41 | }, | 51 | }, |
42 | 52 | ||
43 | prepareForDraw: { | 53 | prepareForDraw: { |
@@ -103,6 +113,8 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len | |||
103 | value: function(evt) { | 113 | value: function(evt) { |
104 | var response = JSON.parse(evt.target.responseText); | 114 | var response = JSON.parse(evt.target.responseText); |
105 | this.searchResults = response.feed.entry; | 115 | this.searchResults = response.feed.entry; |
116 | this.flow.length = this.initialPosition; | ||
117 | this.flow.origin = this.initialPosition; | ||
106 | this.isSearching = false; | 118 | this.isSearching = false; |
107 | } | 119 | } |
108 | }, | 120 | }, |