diff options
author | Armen Kesablyan | 2012-07-02 13:19:20 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-07-02 13:19:20 -0700 |
commit | 526b9d76686323f488f1b26175440172b715d808 (patch) | |
tree | 47fc6bd90715b403a08d08a48a86f4d24da1ba29 /node_modules/montage-google/youtube-channel.reel | |
parent | b194664df7e01aaeb8d1e7220a6de0e7f879f1db (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-526b9d76686323f488f1b26175440172b715d808.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'node_modules/montage-google/youtube-channel.reel')
-rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.html | 10 | ||||
-rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.js | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html index 01cc42f3..65ffc945 100644 --- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html | |||
@@ -96,7 +96,7 @@ | |||
96 | .montage-youtube-channel-close { | 96 | .montage-youtube-channel-close { |
97 | position: absolute; | 97 | position: absolute; |
98 | top: 5px; | 98 | top: 5px; |
99 | left: 5px; | 99 | right: 5px; |
100 | 100 | ||
101 | width: 25px; | 101 | width: 25px; |
102 | height: 25px; | 102 | height: 25px; |
@@ -107,6 +107,14 @@ | |||
107 | 107 | ||
108 | color: #EEE; | 108 | color: #EEE; |
109 | outline: none; | 109 | outline: none; |
110 | text-align: center; | ||
111 | padding: 0; | ||
112 | } | ||
113 | |||
114 | .montage-youtube-channel .montage-youtube-player { | ||
115 | border-top: 35px solid #000; | ||
116 | -webkit-box-sizing: border-box; | ||
117 | box-sizing: border-box; | ||
110 | } | 118 | } |
111 | </style> | 119 | </style> |
112 | </head> | 120 | </head> |
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 95cd336a..f06216e1 100644 --- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js +++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js | |||
@@ -180,8 +180,12 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
180 | 180 | ||
181 | // take the video from the top only once it's stopped animating | 181 | // take the video from the top only once it's stopped animating |
182 | window.setTimeout(function() { | 182 | window.setTimeout(function() { |
183 | self.element.style.zIndex = null; | 183 | self._element.style.zIndex = null; |
184 | }, 500); | 184 | // HACK: Trigger a redraw so that Flash in Chrome on |
185 | // Windows doesn't remain rendered on top of everything, | ||
186 | // despite actually being hidden | ||
187 | self.player.element.getBoundingClientRect(); | ||
188 | }, 510); | ||
185 | } | 189 | } |
186 | 190 | ||
187 | } | 191 | } |
@@ -196,6 +200,7 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
196 | value: function() { | 200 | value: function() { |
197 | var doc = this._element.ownerDocument; | 201 | var doc = this._element.ownerDocument; |
198 | 202 | ||
203 | this._popupElement.style.width = doc.width + "px"; | ||
199 | this.player.width = doc.width; | 204 | this.player.width = doc.width; |
200 | this.player.height = doc.height; | 205 | this.player.height = doc.height; |
201 | 206 | ||