diff options
Diffstat (limited to 'node_modules/montage-google/youtube-channel.reel')
-rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.html | 11 | ||||
-rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.js | 19 |
2 files changed, 21 insertions, 9 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 112fda72..65ffc945 100644 --- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html | |||
@@ -41,7 +41,6 @@ | |||
41 | }, | 41 | }, |
42 | 42 | ||
43 | "owner": { | 43 | "owner": { |
44 | "module": "youtube-channel.reel", | ||
45 | "name": "YoutubeChannel", | 44 | "name": "YoutubeChannel", |
46 | "properties": { | 45 | "properties": { |
47 | "element": {"#": "container"}, | 46 | "element": {"#": "container"}, |
@@ -97,7 +96,7 @@ | |||
97 | .montage-youtube-channel-close { | 96 | .montage-youtube-channel-close { |
98 | position: absolute; | 97 | position: absolute; |
99 | top: 5px; | 98 | top: 5px; |
100 | left: 5px; | 99 | right: 5px; |
101 | 100 | ||
102 | width: 25px; | 101 | width: 25px; |
103 | height: 25px; | 102 | height: 25px; |
@@ -108,6 +107,14 @@ | |||
108 | 107 | ||
109 | color: #EEE; | 108 | color: #EEE; |
110 | 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; | ||
111 | } | 118 | } |
112 | </style> | 119 | </style> |
113 | </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 ca08564b..f06216e1 100644 --- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js +++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js | |||
@@ -124,6 +124,8 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
124 | 124 | ||
125 | draw: { | 125 | draw: { |
126 | value: function() { | 126 | value: function() { |
127 | var self = this; | ||
128 | |||
127 | if (this._script) { | 129 | if (this._script) { |
128 | if(this.element.childNodes.length < 1) { | 130 | if(this.element.childNodes.length < 1) { |
129 | this._savedReference.appendChild(this._script); | 131 | this._savedReference.appendChild(this._script); |
@@ -135,9 +137,9 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
135 | } | 137 | } |
136 | 138 | ||
137 | if (this._entries) { | 139 | if (this._entries) { |
138 | this.imageA.src = this._entries[0]["media$group"]["media$thumbnail"][0].url; | 140 | this.imageA.src = (this._entries[0]) ? this._entries[0]["media$group"]["media$thumbnail"][0].url : ""; |
139 | this.imageB.src = this._entries[1]["media$group"]["media$thumbnail"][0].url; | 141 | this.imageB.src = (this._entries[1]) ? this._entries[1]["media$group"]["media$thumbnail"][0].url : ""; |
140 | this.imageC.src = this._entries[2]["media$group"]["media$thumbnail"][0].url; | 142 | this.imageC.src = (this._entries[2]) ? this._entries[2]["media$group"]["media$thumbnail"][0].url : ""; |
141 | } | 143 | } |
142 | 144 | ||
143 | if (this._videoId) { | 145 | if (this._videoId) { |
@@ -145,8 +147,6 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
145 | this._videoId = null; | 147 | this._videoId = null; |
146 | } | 148 | } |
147 | 149 | ||
148 | var self = this; | ||
149 | |||
150 | if (this._shouldShowPopup) { | 150 | if (this._shouldShowPopup) { |
151 | this._positionPopup(); | 151 | this._positionPopup(); |
152 | 152 | ||
@@ -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 | ||