diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index cd36f2fa..0daab287 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -1030,15 +1030,10 @@ Callbacks = { $("
").attr("id", "ytapiplayer") .insertBefore($("#ytapiplayer_wrapper")); $("#ytapiplayer_wrapper").remove(); - } else if(data.type != "me" && PLAYER.type == "me") { - var mejs = $(".mejs-container"); - $("
").attr("id", "ytapiplayer") - .insertBefore(mejs[0]); - mejs.remove(); } if (data.type === "vi" && data.direct && data.direct.sd) { - data.type = "me"; + data.type = "rv"; data.url = data.direct.sd.url; } diff --git a/www/assets/js/player.js b/www/assets/js/player.js index e7a39d67..37f6ade1 100644 --- a/www/assets/js/player.js +++ b/www/assets/js/player.js @@ -990,22 +990,21 @@ var GoogleDocsPlayer = function (data) { self.init(data); }; -function MediaElementsPlayer(data) { +function RawVideoPlayer(data) { var self = this; self.init = function (data) { self.videoId = data.id; self.videoURL = data.url; - waitUntilDefined(window, "MediaElementPlayer", function () { - var video = $("