From c6d214b981bb29f766f47517d376cf5bc974713a Mon Sep 17 00:00:00 2001 From: calzoneman Date: Tue, 7 Jan 2014 17:14:16 -0600 Subject: [PATCH] Use native HTML5 controls; remove pile of shit known as mediaelementjs --- www/assets/js/callbacks.js | 7 +- www/assets/js/player.js | 36 +- www/assets/mediaelement/background.png | Bin 166 -> 0 bytes www/assets/mediaelement/bigplay.png | Bin 3001 -> 0 bytes www/assets/mediaelement/bigplay.svg | 1 - www/assets/mediaelement/controls-ted.png | Bin 1559 -> 0 bytes www/assets/mediaelement/controls-wmp-bg.png | Bin 1960 -> 0 bytes www/assets/mediaelement/controls-wmp.png | Bin 5511 -> 0 bytes www/assets/mediaelement/controls.png | Bin 1892 -> 0 bytes www/assets/mediaelement/controls.svg | 1 - .../mediaelement/flashmediaelement-cdn.swf | Bin 29149 -> 0 bytes www/assets/mediaelement/flashmediaelement.swf | Bin 29142 -> 0 bytes www/assets/mediaelement/jquery.js | 9597 ----------------- www/assets/mediaelement/loading.gif | Bin 6224 -> 0 bytes .../mediaelement/mediaelement-and-player.js | 5097 --------- .../mediaelement-and-player.min.js | 174 - www/assets/mediaelement/mediaelement.js | 1932 ---- www/assets/mediaelement/mediaelement.min.js | 69 - .../mediaelement/mediaelementplayer.css | 870 -- www/assets/mediaelement/mediaelementplayer.js | 3163 ------ .../mediaelement/mediaelementplayer.min.css | 1 - .../mediaelement/mediaelementplayer.min.js | 103 - www/assets/mediaelement/mejs-skins.css | 289 - .../mediaelement/silverlightmediaelement.xap | Bin 12461 -> 0 bytes www/channel.html | 2 - 25 files changed, 19 insertions(+), 21323 deletions(-) delete mode 100644 www/assets/mediaelement/background.png delete mode 100644 www/assets/mediaelement/bigplay.png delete mode 100644 www/assets/mediaelement/bigplay.svg delete mode 100644 www/assets/mediaelement/controls-ted.png delete mode 100644 www/assets/mediaelement/controls-wmp-bg.png delete mode 100644 www/assets/mediaelement/controls-wmp.png delete mode 100644 www/assets/mediaelement/controls.png delete mode 100644 www/assets/mediaelement/controls.svg delete mode 100755 www/assets/mediaelement/flashmediaelement-cdn.swf delete mode 100644 www/assets/mediaelement/flashmediaelement.swf delete mode 100644 www/assets/mediaelement/jquery.js delete mode 100644 www/assets/mediaelement/loading.gif delete mode 100644 www/assets/mediaelement/mediaelement-and-player.js delete mode 100644 www/assets/mediaelement/mediaelement-and-player.min.js delete mode 100644 www/assets/mediaelement/mediaelement.js delete mode 100644 www/assets/mediaelement/mediaelement.min.js delete mode 100644 www/assets/mediaelement/mediaelementplayer.css delete mode 100644 www/assets/mediaelement/mediaelementplayer.js delete mode 100644 www/assets/mediaelement/mediaelementplayer.min.css delete mode 100644 www/assets/mediaelement/mediaelementplayer.min.js delete mode 100644 www/assets/mediaelement/mejs-skins.css delete mode 100644 www/assets/mediaelement/silverlightmediaelement.xap 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 = $("