aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/montage')
-rw-r--r--node_modules/montage/ui/youtube-channel.reel/youtube-channel.html2
-rw-r--r--node_modules/montage/ui/youtube-channel.reel/youtube-channel.js11
2 files changed, 11 insertions, 2 deletions
diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
index f40ccadb..848322e0 100644
--- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
@@ -84,11 +84,13 @@
84 84
85 opacity: 0; 85 opacity: 0;
86 visibility: hidden; 86 visibility: hidden;
87 -webkit-transform: scale3d(0, 0, 1);
87 -webkit-transition: all 0.5s ease-in-out; 88 -webkit-transition: all 0.5s ease-in-out;
88 } 89 }
89 .montage-youtube-channel-popup.show { 90 .montage-youtube-channel-popup.show {
90 opacity: 1; 91 opacity: 1;
91 visibility: visible; 92 visibility: visible;
93 -webkit-transform: scale3d(1, 1, 1);
92 } 94 }
93 95
94 .montage-youtube-channel-close { 96 .montage-youtube-channel-close {
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 {