From a93ab1f2c5e87931b7f522a8e950a457de668579 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 21 Jun 2012 23:02:33 -0700 Subject: Fixed issue with Youtube not updating after save and Picasa bacground Signed-off-by: Valerio Virgillito --- .../picasa-carousel.reel/image.reel/image.html | 1 - .../picasa-carousel.reel/picasa-carousel.css | 38 +++++++++--------- .../picasa-carousel.reel/picasa-carousel.html | 45 +--------------------- .../picasa-carousel.reel/picasa-carousel.js | 2 +- .../youtube-channel.reel/youtube-channel.js | 22 ++++++++--- 5 files changed, 39 insertions(+), 69 deletions(-) (limited to 'node_modules/montage-google') 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 @@ margin-left: -105px; width: 206px; height: 140px; - border-radius: 4px; border: 2px solid #888; background-repeat: no-repeat; 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 @@ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ + + .montage-google-picasa-carousel { width: 100%; height: 100%; - display: -webkit-box; - -webkit-box-pack: center; - -webkit-box-align: center; - display: -moz-box; - -moz-box-pack: center; - -moz-box-align: center; - display: -ms-box; - -ms-box-pack: center; - -ms-box-align: center; - display: box; - box-pack: center; - box-align: center; + /*display: -webkit-box;*/ + /*-webkit-box-pack: center;*/ + /*-webkit-box-align: center;*/ + /*display: -moz-box;*/ + /*-moz-box-pack: center;*/ + /*-moz-box-align: center;*/ + /*display: -ms-box;*/ + /*-ms-box-pack: center;*/ + /*-ms-box-align: center;*/ + /*display: box;*/ + /*box-pack: center;*/ + /*box-align: center;*/ + -webkit-transform-style: preserve-3d; } .montage-google-picasa-carousel .flow { width: 100%; height: 100%; -/* top: 0; - left: 0; - right: 0; - bottom: 0; -*/ - background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb)); + + -webkit-transform-style: preserve-3d; + -webkit-perspective: 1400px; } + .image { position: absolute; - /*-top: 50%;*/ -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5); } 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 @@ "nextDensity": 3 } ], + "headOffset": 9, + "tailOffset": 9, "units": {} } ], @@ -113,49 +115,6 @@ } - - 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 resultCount: { enumerable: false, - value: 1000 + value: 500 }, 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, var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { + _savedReference: { + value: null + }, + _userRe: { value: /youtube.com\/(user\/)?([a-z0-9]+)/i }, @@ -113,13 +117,20 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { this.imageC.element.addEventListener("click", this, false); this._positionPopup(); + + this._savedReference = this.element; } }, draw: { value: function() { if (this._script) { - this._element.appendChild(this._script); + if(this.element.childNodes.length < 1) { + this._savedReference.appendChild(this._script); + } else { + this.element.appendChild(this._script); + } + this._script = null; } @@ -134,16 +145,17 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { this._videoId = null; } + var self = this; + if (this._shouldShowPopup) { this._positionPopup(); // Need the video to be on top - this._element.style.zIndex = 9000; + this.element.style.zIndex = 9000; // Fix for Canary where the thumbnail in the video doesn't // change until the CSS transition has finished, so wait for // it to change before starting the animation - var self = this; window.setTimeout(function() { self._element.classList.add("show"); self._popupElement.classList.add("show"); @@ -155,7 +167,7 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { document.addEventListener('keyup', this, false); } } else { - this._element.classList.remove("show"); + this.element.classList.remove("show"); this._popupElement.classList.remove("show"); this.player.stop(); @@ -168,7 +180,7 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { // take the video from the top only once it's stopped animating window.setTimeout(function() { - this._element.style.zIndex = null; + self.element.style.zIndex = null; }, 500); } -- cgit v1.2.3 From abb8e13277dd0bf03fdcd39329afb44afd662770 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 22 Jun 2012 15:02:06 -0700 Subject: fixing the size of the picasa images Signed-off-by: Valerio Virgillito --- .../picasa-carousel.reel/image.reel/image.html | 2 +- .../picasa-carousel.reel/picasa-carousel.css | 21 --------------------- .../picasa-carousel.reel/picasa-carousel.html | 8 +++----- 3 files changed, 4 insertions(+), 27 deletions(-) (limited to 'node_modules/montage-google') 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 f43f9f29..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 @@