diff options
author | Stuart Knightley | 2012-03-20 09:32:21 -0700 |
---|---|---|
committer | Stuart Knightley | 2012-03-20 09:32:21 -0700 |
commit | ab7c54f28151e5ae485881ec53ba22718ff4b449 (patch) | |
tree | 62da645244062f37d70b9cc945ff41bf0086ea4c /node_modules/montage | |
parent | 4de5574b6cd4ab4335867960f1f974a9a89778c7 (diff) | |
download | ninja-ab7c54f28151e5ae485881ec53ba22718ff4b449.tar.gz |
Change Youtube channel transition to avoid rendering bug
Diffstat (limited to 'node_modules/montage')
-rw-r--r-- | node_modules/montage/ui/youtube-channel.reel/youtube-channel.html | 14 | ||||
-rw-r--r-- | node_modules/montage/ui/youtube-channel.reel/youtube-channel.js | 4 |
2 files changed, 11 insertions, 7 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 50286c22..a405fc7c 100644 --- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html | |||
@@ -58,9 +58,15 @@ | |||
58 | height: 90px; | 58 | height: 90px; |
59 | width: 120px; | 59 | width: 120px; |
60 | background-color: #000; | 60 | background-color: #000; |
61 | opacity: 1; | ||
62 | |||
63 | -webkit-transition: opacity 0.5s ease-in-out; | ||
64 | } | ||
65 | .montage-youtube-channel.show img { | ||
66 | opacity: 0; | ||
61 | } | 67 | } |
62 | 68 | ||
63 | .montage-youtube-channel-popup { | 69 | .montage-youtube-channel .montage-youtube-channel-popup { |
64 | width: 640px; | 70 | width: 640px; |
65 | border: 5px solid #000; | 71 | border: 5px solid #000; |
66 | border-radius: 5px; | 72 | border-radius: 5px; |
@@ -74,13 +80,11 @@ | |||
74 | 80 | ||
75 | z-index: 9000; | 81 | z-index: 9000; |
76 | 82 | ||
77 | -webkit-transform: scale3d(0, 0, 1); | ||
78 | opacity: 0; | 83 | opacity: 0; |
79 | -webkit-transition: all 0.5s ease-in-out; | ||
80 | visibility: hidden; | 84 | visibility: hidden; |
85 | -webkit-transition: all 0.5s ease-in-out; | ||
81 | } | 86 | } |
82 | .montage-youtube-channel-popup.show { | 87 | .montage-youtube-channel.show .montage-youtube-channel-popup { |
83 | -webkit-transform: scale3d(1, 1, 1); | ||
84 | opacity: 1; | 88 | opacity: 1; |
85 | visibility: visible; | 89 | visibility: visible; |
86 | } | 90 | } |
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 3d9f7f2f..ccbd9978 100644 --- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js | |||
@@ -133,7 +133,7 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
133 | } | 133 | } |
134 | 134 | ||
135 | if (this._shouldShowPopup) { | 135 | if (this._shouldShowPopup) { |
136 | this._popupElement.classList.add("show"); | 136 | this._element.classList.add("show"); |
137 | if (window.Touch) { | 137 | if (window.Touch) { |
138 | document.addEventListener('touchstart', this, false); | 138 | document.addEventListener('touchstart', this, false); |
139 | } else { | 139 | } else { |
@@ -141,7 +141,7 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
141 | document.addEventListener('keyup', this, false); | 141 | document.addEventListener('keyup', this, false); |
142 | } | 142 | } |
143 | } else { | 143 | } else { |
144 | this._popupElement.classList.remove("show"); | 144 | this._element.classList.remove("show"); |
145 | this.player.stop(); | 145 | this.player.stop(); |
146 | 146 | ||
147 | if (window.Touch) { | 147 | if (window.Touch) { |