equal
deleted
inserted
replaced
181 spacerDiv = _divs[1], |
181 spacerDiv = _divs[1], |
182 _this = this, |
182 _this = this, |
183 _types = { |
183 _types = { |
184 "html5" : /\.(ogg|ogv|webm)$/, |
184 "html5" : /\.(ogg|ogv|webm)$/, |
185 "youtube" : /^(https?:\/\/)?(www\.)?youtube\.com/, |
185 "youtube" : /^(https?:\/\/)?(www\.)?youtube\.com/, |
|
186 "vimeo" : /^(https?:\/\/)?(www\.)?vimeo\.com/, |
186 "dailymotion" : /^(https?:\/\/)?(www\.)?dailymotion\.com/ |
187 "dailymotion" : /^(https?:\/\/)?(www\.)?dailymotion\.com/ |
187 }; |
188 }; |
188 |
189 |
189 if (this.config.player.type === "auto") { |
190 if (this.config.player.type === "auto") { |
190 this.config.player.type = "jwplayer"; |
191 this.config.player.type = "jwplayer"; |
274 _params.modestbranding = 1; |
275 _params.modestbranding = 1; |
275 _url = _urlparts[0] + '?' + IriSP.jQuery.param(_params); |
276 _url = _urlparts[0] + '?' + IriSP.jQuery.param(_params); |
276 _pop = Popcorn.youtube("#" + containerDiv, _url); |
277 _pop = Popcorn.youtube("#" + containerDiv, _url); |
277 break; |
278 break; |
278 |
279 |
|
280 case "vimeo": |
|
281 // Popcorn.vimeo wants us to specify the size of the player in the style attribute of its container div. |
|
282 IriSP.jQuery("#" + containerDiv).css({ |
|
283 width : this.config.player.width + "px", |
|
284 height : this.config.player.height + "px" |
|
285 }); |
|
286 _pop = Popcorn.vimeo("#" + containerDiv, this.config.player.video); |
|
287 break; |
|
288 |
279 case "dailymotion": |
289 case "dailymotion": |
280 _pop = new IriSP.PopcornReplacement.dailymotion("#" + containerDiv, this.config.player); |
290 _pop = new IriSP.PopcornReplacement.dailymotion("#" + containerDiv, this.config.player); |
281 break; |
291 break; |
282 |
292 |
283 case "mashup": |
293 case "mashup": |