Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

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, {
 
                 // take the video from the top only once it's stopped animating
                 window.setTimeout(function() {
-                    self.element.style.zIndex = null;
-                }, 500);
+                    self._element.style.zIndex = null;
+                    // HACK: Trigger a redraw so that Flash in Chrome on
+                    // Windows doesn't remain rendered on top of everything,
+                    // despite actually being hidden
+                    self.player.element.getBoundingClientRect();
+                }, 510);
             }
 
         }
@@ -196,6 +200,7 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
         value: function() {
             var doc = this._element.ownerDocument;
 
+            this._popupElement.style.width = doc.width + "px";
             this.player.width = doc.width;
             this.player.height = doc.height;