diff options
author | Jon Reid | 2012-06-25 11:07:33 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-25 11:07:33 -0700 |
commit | 831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch) | |
tree | aa6acda9aeddad8f93cae63b955349a442ddf01f /node_modules/montage-google | |
parent | 82638621ed793fcb37438798363dba151efd9cd2 (diff) | |
parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
download | ninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolution: Use both.
Diffstat (limited to 'node_modules/montage-google')
5 files changed, 29 insertions, 82 deletions
diff --git a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html index 368bd059..050c0643 100644 --- a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html +++ b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html | |||
@@ -9,7 +9,7 @@ | |||
9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
10 | { | 10 | { |
11 | "owner": { | 11 | "owner": { |
12 | "prototype": "montage-google/picasa-carousel.reel/image.reel", | 12 | "prototype": "picasa-carousel.reel/image.reel", |
13 | "properties": { | 13 | "properties": { |
14 | "element": {"#": "Image"} | 14 | "element": {"#": "Image"} |
15 | } | 15 | } |
@@ -26,7 +26,6 @@ | |||
26 | margin-left: -105px; | 26 | margin-left: -105px; |
27 | width: 206px; | 27 | width: 206px; |
28 | height: 140px; | 28 | height: 140px; |
29 | border-radius: 4px; | ||
30 | border: 2px solid #888; | 29 | border: 2px solid #888; |
31 | background-repeat: no-repeat; | 30 | background-repeat: no-repeat; |
32 | background-position: center center; | 31 | background-position: center center; |
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css index 2494614b..b60493bf 100755 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css | |||
@@ -3,39 +3,18 @@ | |||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<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. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | |||
7 | |||
6 | .montage-google-picasa-carousel { | 8 | .montage-google-picasa-carousel { |
7 | width: 100%; | 9 | width: 100%; |
8 | height: 100%; | 10 | height: 100%; |
9 | display: -webkit-box; | 11 | -webkit-transform-style: preserve-3d; |
10 | -webkit-box-pack: center; | ||
11 | -webkit-box-align: center; | ||
12 | display: -moz-box; | ||
13 | -moz-box-pack: center; | ||
14 | -moz-box-align: center; | ||
15 | display: -ms-box; | ||
16 | -ms-box-pack: center; | ||
17 | -ms-box-align: center; | ||
18 | display: box; | ||
19 | box-pack: center; | ||
20 | box-align: center; | ||
21 | } | 12 | } |
22 | 13 | ||
23 | .montage-google-picasa-carousel .flow { | 14 | .montage-google-picasa-carousel .flow { |
24 | width: 100%; | 15 | width: 100%; |
25 | height: 100%; | 16 | height: 100%; |
26 | /* top: 0; | ||
27 | left: 0; | ||
28 | right: 0; | ||
29 | bottom: 0; | ||
30 | */ | ||
31 | background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb)); | ||
32 | } | ||
33 | .image { | ||
34 | position: absolute; | ||
35 | /*-top: 50%;*/ | ||
36 | -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5); | ||
37 | } | ||
38 | 17 | ||
39 | .montage-google-picasa-carousel .flow .montage-flow-repetition { | 18 | -webkit-transform-style: preserve-3d; |
40 | margin: 10% 0; | 19 | -webkit-perspective: 1400px; |
41 | } | 20 | } |
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html index dc70a19c..8712c228 100755 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html | |||
@@ -46,6 +46,8 @@ | |||
46 | "name": "Flow", | 46 | "name": "Flow", |
47 | "properties": { | 47 | "properties": { |
48 | "element": {"#": "flow"}, | 48 | "element": {"#": "flow"}, |
49 | "cameraFov": 20, | ||
50 | "stride": 1, | ||
49 | "paths": [ | 51 | "paths": [ |
50 | { | 52 | { |
51 | "knots": [ | 53 | "knots": [ |
@@ -97,65 +99,20 @@ | |||
97 | "nextDensity": 3 | 99 | "nextDensity": 3 |
98 | } | 100 | } |
99 | ], | 101 | ], |
102 | "headOffset": 9, | ||
103 | "tailOffset": 9, | ||
100 | "units": {} | 104 | "units": {} |
101 | } | 105 | } |
102 | ], | 106 | ], |
103 | "elementsBoundingSphereRadius": 700 | 107 | "elementsBoundingSphereRadius": 700 |
104 | }, | 108 | }, |
105 | "bindings": { | 109 | "bindings": { |
106 | "objects": { | 110 | "objects": {"<-": "@searchResultsController.content"} |
107 | "boundObject": {"@": "searchResultsController"}, | ||
108 | "boundObjectPropertyPath": "content", | ||
109 | "oneway": true | ||
110 | } | ||
111 | } | 111 | } |
112 | } | 112 | } |
113 | } | 113 | } |
114 | </script> | 114 | </script> |
115 | 115 | ||
116 | <style> | ||
117 | .montage-google-picasa-carousel { | ||
118 | width: 100%; | ||
119 | height: 100%; | ||
120 | display: -webkit-box; | ||
121 | -webkit-box-pack: center; | ||
122 | -webkit-box-align: center; | ||
123 | display: -moz-box; | ||
124 | -moz-box-pack: center; | ||
125 | -moz-box-align: center; | ||
126 | display: -ms-box; | ||
127 | -ms-box-pack: center; | ||
128 | -ms-box-align: center; | ||
129 | display: box; | ||
130 | box-pack: center; | ||
131 | box-align: center; | ||
132 | -webkit-transform-style: preserve-3d; | ||
133 | } | ||
134 | |||
135 | .montage-google-picasa-carousel .flow { | ||
136 | width: 100%; | ||
137 | height: 100%; | ||
138 | /* top: 0; | ||
139 | left: 0; | ||
140 | right: 0; | ||
141 | bottom: 0; | ||
142 | */ | ||
143 | /*background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb));*/ | ||
144 | -webkit-transform-style: preserve-3d; | ||
145 | -webkit-perspective: 1400px; | ||
146 | } | ||
147 | .image { | ||
148 | position: absolute; | ||
149 | /*-top: 50%;*/ | ||
150 | -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5); | ||
151 | } | ||
152 | |||
153 | .montage-google-picasa-carousel .flow .montage-flow-repetition { | ||
154 | margin: 10% 0; | ||
155 | } | ||
156 | |||
157 | </style> | ||
158 | |||
159 | </head> | 116 | </head> |
160 | <body> | 117 | <body> |
161 | 118 | ||
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js index 0b669b80..7e9c64ec 100644 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js | |||
@@ -45,7 +45,7 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len | |||
45 | 45 | ||
46 | resultCount: { | 46 | resultCount: { |
47 | enumerable: false, | 47 | enumerable: false, |
48 | value: 1000 | 48 | value: 500 |
49 | }, | 49 | }, |
50 | 50 | ||
51 | prepareForDraw: { | 51 | prepareForDraw: { |
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js index 782318f0..ca08564b 100644 --- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js +++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js | |||
@@ -10,6 +10,10 @@ var Montage = require("montage").Montage, | |||
10 | 10 | ||
11 | var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | 11 | var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { |
12 | 12 | ||
13 | _savedReference: { | ||
14 | value: null | ||
15 |