rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Fix everything except justin.tv, twitch.tv

Browse source
This commit is contained in:
calzoneman 2013-09-10 17:18:02 -05:00
parent aadba26891
commit beae68d1c2
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -1,3 +1,7 @@
Tue Sep 10 17:17 2013 CDT
* www/assets/js/player.js: Fix loading over SSL for everything except
TwitchTV and JustinTV
Tue Sep 10 16:45 2013 CDT Tue Sep 10 16:45 2013 CDT
* lib/channel.js: Don't attempt to emit to SSL sockets if it's disabled * lib/channel.js: Don't attempt to emit to SSL sockets if it's disabled

22
www/assets/js/player.js
View file

@ -111,7 +111,8 @@ var VimeoPlayer = function (data) {
removeOld(iframe); removeOld(iframe);
iframe.attr("width", VWIDTH); iframe.attr("width", VWIDTH);
iframe.attr("height", VHEIGHT); iframe.attr("height", VHEIGHT);
iframe.attr("src", "http://player.vimeo.com/video/"+self.videoId+"?api=1&player_id=ytapiplayer"); var prto = location.protocol;
iframe.attr("src", prto+"//player.vimeo.com/video/"+self.videoId+"?api=1&player_id=ytapiplayer");
iframe.attr("webkitAllowFullScreen", ""); iframe.attr("webkitAllowFullScreen", "");
iframe.attr("mozallowfullscreen", ""); iframe.attr("mozallowfullscreen", "");
iframe.attr("allowFullScreen", ""); iframe.attr("allowFullScreen", "");
@ -185,7 +186,8 @@ var VimeoFlashPlayer = function (data) {
self.videoId = data.id; self.videoId = data.id;
self.init = function () { self.init = function () {
removeOld(); removeOld();
var url = "http://vimeo.com/moogaloop.swf?clip_id="+self.videoId; var prto = location.protocol;
var url = prto+"//vimeo.com/moogaloop.swf?clip_id="+self.videoId;
url += "&" + [ url += "&" + [
"server=vimeo.com", "server=vimeo.com",
"api=2", "api=2",
@ -429,8 +431,9 @@ var LivestreamPlayer = function (data) {
self.init = function () { self.init = function () {
var flashvars = { channel: self.videoId }; var flashvars = { channel: self.videoId };
var params = { AllowScriptAccess: "always" }; var params = { AllowScriptAccess: "always" };
var prto = location.protocol;
swfobject.embedSWF( swfobject.embedSWF(
"http://cdn.livestream.com/chromelessPlayer/v20/playerapi.swf", prto+"//cdn.livestream.com/chromelessPlayer/v20/playerapi.swf",
"ytapiplayer", "ytapiplayer",
VWIDTH, VHEIGHT, VWIDTH, VHEIGHT,
"9.0.0", "9.0.0",
@ -505,6 +508,7 @@ var JustinTVPlayer = function (data) {
var self = this; var self = this;
self.videoId = data.id; self.videoId = data.id;
self.init = function () { self.init = function () {
var prto = location.protocol;
var url = "http://www.justin.tv/widgets/live_embed_player.swf?channel="+self.videoId; var url = "http://www.justin.tv/widgets/live_embed_player.swf?channel="+self.videoId;
var params = { var params = {
allowFullScreen: "true", allowFullScreen: "true",
@ -547,14 +551,15 @@ var RTMPPlayer = function (data) {
var self = this; var self = this;
self.videoId = data.id; self.videoId = data.id;
self.init = function () { self.init = function () {
var url = "http://fpdownload.adobe.com/strobe/FlashMediaPlayback_101.swf"; var prto = location.protocol;
var url = prto+"//fpdownload.adobe.com/strobe/FlashMediaPlayback_101.swf";
var src = encodeURIComponent(self.videoId); var src = encodeURIComponent(self.videoId);
var params = { var params = {
allowFullScreen: "true", allowFullScreen: "true",
allowScriptAccess: "always", allowScriptAccess: "always",
allowNetworking: "all", allowNetworking: "all",
wMode: "direct", wMode: "direct",
movie: "http://fpdownload.adobe.com/strobe/FlashMediaPlayback_101.swf", movie: prto+"//fpdownload.adobe.com/strobe/FlashMediaPlayback_101.swf",
flashvars: "src="+src+"&streamType=live&autoPlay=true" flashvars: "src="+src+"&streamType=live&autoPlay=true"
}; };
swfobject.embedSWF(url, swfobject.embedSWF(url,
@ -656,7 +661,8 @@ var UstreamPlayer = function (data) {
removeOld(iframe); removeOld(iframe);
iframe.attr("width", VWIDTH); iframe.attr("width", VWIDTH);
iframe.attr("height", VHEIGHT); iframe.attr("height", VHEIGHT);
iframe.attr("src", "http://www.ustream.tv/embed/"+self.videoId+"?v=3&wmode=direct"); var prto = location.protocol;
iframe.attr("src", prto+"//www.ustream.tv/embed/"+self.videoId+"?v=3&wmode=direct");
iframe.attr("frameborder", "0"); iframe.attr("frameborder", "0");
iframe.attr("scrolling", "no"); iframe.attr("scrolling", "no");
iframe.css("border", "none"); iframe.css("border", "none");
@ -687,7 +693,9 @@ var ImgurPlayer = function (data) {
removeOld(iframe); removeOld(iframe);
iframe.attr("width", VWIDTH); iframe.attr("width", VWIDTH);
iframe.attr("height", VHEIGHT); iframe.attr("height", VHEIGHT);
iframe.attr("src", "http://imgur.com/a/"+self.videoId+"/embed"); var prto = location.protocol;
iframe.attr("src", prto+"//imgur.com/a/"+self.videoId+"/embed");
console.log(prto);
iframe.attr("frameborder", "0"); iframe.attr("frameborder", "0");
iframe.attr("scrolling", "no"); iframe.attr("scrolling", "no");
iframe.css("border", "none"); iframe.css("border", "none");