diff options
author | Valerio Virgillito | 2012-06-22 13:44:58 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-22 13:44:58 -0700 |
commit | d3ca3d60b7a0e1455175612824b351bf841447e0 (patch) | |
tree | e6d4cddfb2c245f5f0c251ce9681ed9a71b61bc2 /node_modules/montage-google | |
parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
parent | a93ab1f2c5e87931b7f522a8e950a457de668579 (diff) | |
download | ninja-d3ca3d60b7a0e1455175612824b351bf841447e0.tar.gz |
Merge pull request #327 from mencio/component-fixes
Fixed issue with Youtube not updating after save and Picasa background
Diffstat (limited to 'node_modules/montage-google')
5 files changed, 39 insertions, 69 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..f43f9f29 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 | |||
@@ -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..bdb1a04f 100755 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css | |||
@@ -3,36 +3,36 @@ | |||
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 | /*display: -webkit-box;*/ |
10 | -webkit-box-pack: center; | 12 | /*-webkit-box-pack: center;*/ |
11 | -webkit-box-align: center; | 13 | /*-webkit-box-align: center;*/ |
12 | display: -moz-box; | 14 | /*display: -moz-box;*/ |
13 | -moz-box-pack: center; | 15 | /*-moz-box-pack: center;*/ |
14 | -moz-box-align: center; | 16 | /*-moz-box-align: center;*/ |
15 | display: -ms-box; | 17 | /*display: -ms-box;*/ |
16 | -ms-box-pack: center; | 18 | /*-ms-box-pack: center;*/ |
17 | -ms-box-align: center; | 19 | /*-ms-box-align: center;*/ |
18 | display: box; | 20 | /*display: box;*/ |
19 | box-pack: center; | 21 | /*box-pack: center;*/ |
20 | box-align: center; | 22 | /*box-align: center;*/ |
23 | -webkit-transform-style: preserve-3d; | ||
21 | } | 24 | } |
22 | 25 | ||
23 | .montage-google-picasa-carousel .flow { | 26 | .montage-google-picasa-carousel .flow { |
24 | width: 100%; | 27 | width: 100%; |
25 | height: 100%; | 28 | height: 100%; |
26 | /* top: 0; | 29 | |
27 | left: 0; | 30 | -webkit-transform-style: preserve-3d; |
28 | right: 0; | 31 | -webkit-perspective: 1400px; |
29 | bottom: 0; | ||
30 | */ | ||
31 | background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb)); | ||
32 | } | 32 | } |
33 | |||
33 | .image { | 34 | .image { |
34 | position: absolute; | 35 | position: absolute; |
35 | /*-top: 50%;*/ | ||
36 | -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5); | 36 | -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5); |
37 | } | 37 | } |
38 | 38 | ||
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..1f2c47d1 100755 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html | |||
@@ -97,6 +97,8 @@ | |||
97 | "nextDensity": 3 | 97 | "nextDensity": 3 |
98 | } | 98 | } |
99 | ], | 99 | ], |
100 | "headOffset": 9, | ||
101 | "tailOffset": 9, | ||
100 | "units": {} | 102 | "units": {} |
101 | } | 103 | } |
102 | ], | 104 | ], |
@@ -113,49 +115,6 @@ | |||
113 | } | 115 | } |
114 | </script> | 116 | </script> |
115 | 117 | ||
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> | 118 | </head> |
160 | <body> | 119 | <body> |
161 | 120 | ||
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 | }, | ||
16 | |||
13 | _userRe: { | 17 | _userRe: { |
14 | value: /youtube.com\/(user\/)?([a-z0-9]+)/i | 18 | value: /youtube.com\/(user\/)?([a-z0-9]+)/i |
15 | }, | 19 | }, |
@@ -113,13 +117,20 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
113 | this.imageC.element.addEventListener("click", this, false); | 117 | this.imageC.element.addEventListener("click", this, false); |
114 | 118 | ||
115 | this._positionPopup(); | 119 | this._positionPopup(); |
120 | |||
121 | this._savedReference = this.element; | ||
116 | } | 122 | } |
117 | }, | 123 | }, |
118 | 124 | ||
119 | draw: { | 125 | draw: { |
120 | value: function() { | 126 | value: function() { |
121 | if (this._script) { | 127 | if (this._script) { |
122 | this._element.appendChild(this._script); | 128 | if(this.element.childNodes.length < 1) { |
129 | this._savedReference.appendChild(this._script); | ||
130 | } else { | ||
131 | this.element.appendChild(this._script); | ||
132 | } | ||
133 | |||
123 | this._script = null; | 134 | this._script = null; |
124 | } | 135 | } |
125 | 136 | ||
@@ -134,16 +145,17 @@ var |