diff options
author | Stuart Knightley | 2012-03-21 14:27:43 -0700 |
---|---|---|
committer | Stuart Knightley | 2012-03-21 14:27:43 -0700 |
commit | 0243eed41eddd5bde3a7ce0c6e2ae7313457b19b (patch) | |
tree | d9b572d5651ff5cf643fa7b9dcac860772816593 /node_modules/montage/ui/youtube-channel.reel/youtube-channel.js | |
parent | 7edc0c123f9157d48543b09f5a9d7bb496e14f44 (diff) | |
download | ninja-0243eed41eddd5bde3a7ce0c6e2ae7313457b19b.tar.gz |
Add scale animation back to youtube channel
Masks animation error on Canary.
Also looks cool.
Diffstat (limited to 'node_modules/montage/ui/youtube-channel.reel/youtube-channel.js')
-rw-r--r-- | node_modules/montage/ui/youtube-channel.reel/youtube-channel.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js index 6cd43a3c..30920953 100644 --- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js | |||
@@ -136,8 +136,15 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
136 | 136 | ||
137 | if (this._shouldShowPopup) { | 137 | if (this._shouldShowPopup) { |
138 | this._positionPopup(); | 138 | this._positionPopup(); |
139 | this._element.classList.add("show"); | 139 | |
140 | this._popupElement.classList.add("show"); | 140 | // Fix for Canary where the thumbnail in the video doesn't |
141 | // change until the CSS transition has finished, so wait for | ||
142 | // it to change before starting the animation | ||
143 | var self = this; | ||
144 | window.setTimeout(function() { | ||
145 | self._element.classList.add("show"); | ||
146 | self._popupElement.classList.add("show"); | ||
147 | }, 50); | ||
141 | if (window.Touch) { | 148 | if (window.Touch) { |
142 | document.addEventListener('touchstart', this, false); | 149 | document.addEventListener('touchstart', this, false); |
143 | } else { | 150 | } else { |