moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ustream embeds

This commit is contained in:
calzoneman 2015-07-07 19:30:39 -07:00
parent d1f21573e6
commit bba6b29483
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
player/ustream.coffee
View File

@ -1,3 +1,10 @@
USTREAM_ERROR = 'Ustream.tv\'s embed player only works over plain HTTP, but you are
viewing this page over secure HTTPS. Your browser therefore blocks the
ustream embed due to mixed content policy. In order to view ustream, you must
view this page over plain HTTP (change "https://" to "http://" in the address
bar)-- your websocket will still be connecting using secure HTTPS. This is
something that ustream needs to fix.'
window.UstreamPlayer = class UstreamPlayer extends EmbedPlayer window.UstreamPlayer = class UstreamPlayer extends EmbedPlayer
constructor: (data) -> constructor: (data) ->
if not (this instanceof UstreamPlayer) if not (this instanceof UstreamPlayer)
@ -8,5 +15,7 @@ window.UstreamPlayer = class UstreamPlayer extends EmbedPlayer
load: (data) -> load: (data) ->
data.meta.embed = data.meta.embed =
tag: 'iframe' tag: 'iframe'
src: "https://www.ustream.tv/embed/#{data.id}?v=3&wmode=direct&autoplay=1" src: "http://www.ustream.tv/embed/#{data.id}?v=3&wmode=direct&autoplay=1"
super(data) super(data)
mixedContentError: USTREAM_ERROR

8
www/js/player.js
View File

@ -1,5 +1,5 @@
(function() { (function() {
var CUSTOM_EMBED_WARNING, CustomEmbedPlayer, DEFAULT_ERROR, DailymotionPlayer, EmbedPlayer, FilePlayer, HITBOX_ERROR, HitboxPlayer, ImgurPlayer, LivestreamPlayer, Player, RTMPPlayer, SoundCloudPlayer, TYPE_MAP, TwitchPlayer, UstreamPlayer, VideoJSPlayer, VimeoPlayer, YouTubePlayer, codecToMimeType, genParam, sortSources, var CUSTOM_EMBED_WARNING, CustomEmbedPlayer, DEFAULT_ERROR, DailymotionPlayer, EmbedPlayer, FilePlayer, HITBOX_ERROR, HitboxPlayer, ImgurPlayer, LivestreamPlayer, Player, RTMPPlayer, SoundCloudPlayer, TYPE_MAP, TwitchPlayer, USTREAM_ERROR, UstreamPlayer, VideoJSPlayer, VimeoPlayer, YouTubePlayer, codecToMimeType, genParam, sortSources,
extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
hasProp = {}.hasOwnProperty; hasProp = {}.hasOwnProperty;
@ -1024,6 +1024,8 @@
})(EmbedPlayer); })(EmbedPlayer);
USTREAM_ERROR = 'Ustream.tv\'s embed player only works over plain HTTP, but you are viewing this page over secure HTTPS. Your browser therefore blocks the ustream embed due to mixed content policy. In order to view ustream, you must view this page over plain HTTP (change "https://" to "http://" in the address bar)-- your websocket will still be connecting using secure HTTPS. This is something that ustream needs to fix.';
window.UstreamPlayer = UstreamPlayer = (function(superClass) { window.UstreamPlayer = UstreamPlayer = (function(superClass) {
extend(UstreamPlayer, superClass); extend(UstreamPlayer, superClass);
@ -1037,11 +1039,13 @@
UstreamPlayer.prototype.load = function(data) { UstreamPlayer.prototype.load = function(data) {
data.meta.embed = { data.meta.embed = {
tag: 'iframe', tag: 'iframe',
src: "https://www.ustream.tv/embed/" + data.id + "?v=3&wmode=direct&autoplay=1" src: "http://www.ustream.tv/embed/" + data.id + "?v=3&wmode=direct&autoplay=1"
}; };
return UstreamPlayer.__super__.load.call(this, data); return UstreamPlayer.__super__.load.call(this, data);
}; };
UstreamPlayer.prototype.mixedContentError = USTREAM_ERROR;
return UstreamPlayer; return UstreamPlayer;
})(EmbedPlayer); })(EmbedPlayer);