diff options
author | hwc487 | 2012-06-29 13:01:02 -0700 |
---|---|---|
committer | hwc487 | 2012-06-29 13:01:02 -0700 |
commit | 44eba9c1f7935ae13e87a6dcf6ddea0efa63eb05 (patch) | |
tree | 77ec7650cbc397c1792254529b0430cd691fad08 /node_modules/montage-google/youtube-channel.reel/youtube-channel.js | |
parent | 230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (diff) | |
parent | ecd9e3b3b09695e3e7115c04e75add5a20c5c6fe (diff) | |
download | ninja-44eba9c1f7935ae13e87a6dcf6ddea0efa63eb05.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
Diffstat (limited to 'node_modules/montage-google/youtube-channel.reel/youtube-channel.js')
-rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.js | 9 |
1 files changed, 7 insertions, 2 deletions
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 | ||