From bf198c10824e6952a00b25c6226a095e4125d2a5 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 20 Jan 2015 09:19:05 +0100
Subject: [PATCH] OO-697: fix issue with IE 10, hack for IE 8 not needed with
the new synchrone loading of the javascript
---
src/main/webapp/static/movie/controls-ted.png | Bin 1559 -> 0 bytes
.../webapp/static/movie/controls-wmp-bg.png | Bin 1960 -> 0 bytes
src/main/webapp/static/movie/controls-wmp.png | Bin 5511 -> 0 bytes
src/main/webapp/static/movie/mejs-skins.css | 289 ------------------
src/main/webapp/static/movie/player.js | 55 ++--
5 files changed, 29 insertions(+), 315 deletions(-)
delete mode 100644 src/main/webapp/static/movie/controls-ted.png
delete mode 100644 src/main/webapp/static/movie/controls-wmp-bg.png
delete mode 100644 src/main/webapp/static/movie/controls-wmp.png
delete mode 100644 src/main/webapp/static/movie/mejs-skins.css
diff --git a/src/main/webapp/static/movie/controls-ted.png b/src/main/webapp/static/movie/controls-ted.png
deleted file mode 100644
index 3aac05aa83cb7fed54831a19d85a8c267e939720..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1559
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
JPDHLkV1l~`FgySN
diff --git a/src/main/webapp/static/movie/controls-wmp-bg.png b/src/main/webapp/static/movie/controls-wmp-bg.png
deleted file mode 100644
index 89bb9b95602ecfca6290f6006f817da365da7b90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1960
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
A)c^nh
diff --git a/src/main/webapp/static/movie/controls-wmp.png b/src/main/webapp/static/movie/controls-wmp.png
deleted file mode 100644
index 4775ef5b02faf2b826d35dfc72511b6b27fea87b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5511
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
JPDHLkV1kZU;|2f#
diff --git a/src/main/webapp/static/movie/mejs-skins.css b/src/main/webapp/static/movie/mejs-skins.css
deleted file mode 100644
index 5c27cf156fc..00000000000
--- a/src/main/webapp/static/movie/mejs-skins.css
+++ /dev/null
@@ -1,289 +0,0 @@
-/* TED player */
-.mejs-container.mejs-ted {
-
-}
-.mejs-ted .mejs-controls {
- background: #eee;
- height: 65px;
-}
-
-.mejs-ted .mejs-button,
-.mejs-ted .mejs-time {
- position: absolute;
- background: #ddd;
-}
-.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-total {
- background-color: none;
- background: url(controls-ted.png) repeat-x 0 -52px;
- height: 6px;
-}
-.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-buffering {
- height: 6px;
-}
-.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-loaded {
- background-color: none;
- background: url(controls-ted.png) repeat-x 0 -52px;
- width: 0;
- height: 6px;
-}
-.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-current {
- width: 0;
- height: 6px;
- background-color: none;
- background: url(controls-ted.png) repeat-x 0 -59px;
-}
-.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-handle {
- display: block;
- margin: 0;
- width: 14px;
- height: 21px;
- top: -7px;
- border: 0;
- background: url(controls-ted.png) no-repeat 0 0;
-}
-.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-float {
- display: none;
-}
-.mejs-ted .mejs-controls .mejs-playpause-button {
- top: 29px;
- left: 9px;
- width: 49px;
- height: 28px;
-}
-.mejs-ted .mejs-controls .mejs-playpause-button button {
- width: 49px;
- height: 28px;
- background: url(controls-ted.png) no-repeat -50px -23px;
- margin: 0;
- padding: 0;
-}
-.mejs-ted .mejs-controls .mejs-pause button {
- background-position: 0 -23px;
-}
-
-.mejs-ted .mejs-controls .mejs-fullscreen-button {
- top: 34px;
- right: 9px;
- width: 17px;
- height: 15px;
- background : none;
-}
-.mejs-ted .mejs-controls .mejs-fullscreen-button button {
- width: 19px;
- height: 17px;
- background: transparent url(controls-ted.png) no-repeat 0 -66px;
- margin: 0;
- padding: 0;
-}
-.mejs-ted .mejs-controls .mejs-unfullscreen button {
- background: transparent url(controls-ted.png) no-repeat -21px -66px;
- margin: 0;
- padding: 0;
-}
-.mejs-ted .mejs-controls .mejs-volume-button {
- top: 30px;
- right: 35px;
- width: 24px;
- height: 22px;
-}
-.mejs-ted .mejs-controls .mejs-mute button {
- background: url(controls-ted.png) no-repeat -15px 0;
- width: 24px;
- height: 22px;
- margin: 0;
- padding: 0;
-}
-.mejs-ted .mejs-controls .mejs-unmute button {
- background: url(controls-ted.png) no-repeat -40px 0;
- width: 24px;
- height: 22px;
- margin: 0;
- padding: 0;
-}
-.mejs-ted .mejs-controls .mejs-volume-button .mejs-volume-slider {
- background: #fff;
- border: solid 1px #aaa;
- border-width: 1px 1px 0 1px;
- width: 22px;
- height: 65px;
- top: -65px;
-}
-.mejs-ted .mejs-controls .mejs-volume-button .mejs-volume-total {
- background: url(controls-ted.png) repeat-y -41px -66px;
- left: 8px;
- width: 6px;
- height: 50px;
-}
-.mejs-ted .mejs-controls .mejs-volume-button .mejs-volume-current {
- left: 8px;
- width: 6px;
- background: url(controls-ted.png) repeat-y -48px -66px;
- height: 50px;
-}
-
-.mejs-ted .mejs-controls .mejs-volume-button .mejs-volume-handle {
- display: none;
-}
-
-.mejs-ted .mejs-controls .mejs-time span {
- color: #333;
-}
-.mejs-ted .mejs-controls .mejs-currenttime-container {
- position: absolute;
- top: 32px;
- right: 100px;
- border: solid 1px #999;
- background: #fff;
- color: #333;
- padding-top: 2px;
- border-radius: 3px;
- color: #333;
-}
-.mejs-ted .mejs-controls .mejs-duration-container {
-
- position: absolute;
- top: 32px;
- right: 65px;
- border: solid 1px #999;
- background: #fff;
- color: #333;
- padding-top: 2px;
- border-radius: 3px;
- color: #333;
-}
-
-.mejs-ted .mejs-controls .mejs-time button{
- color: #333;
-}
-.mejs-ted .mejs-controls .mejs-captions-button {
- display: none;
-}
-/* END: TED player */
-
-
-/* WMP player */
-.mejs-container.mejs-wmp {
-
-}
-.mejs-wmp .mejs-controls {
- background: transparent url(controls-wmp-bg.png) center 16px no-repeat;
- height: 65px;
-}
-
-.mejs-wmp .mejs-button,
-.mejs-wmp .mejs-time {
- position: absolute;
- background: transparent;
-}
-.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-total {
- background-color: transparent;
- border: solid 1px #ccc;
- height: 3px;
-}
-.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-buffering {
- height: 3px;
-}
-.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-loaded {
- background-color: rgba(255,255,255,0.3);
- width: 0;
- height: 3px;
-}
-.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-current {
- width: 0;
- height: 1px;
- background-color: #014CB6;
- border: solid 1px #7FC9FA;
- border-width: 1px 0;
- border-color: #7FC9FA #fff #619FF2 #fff;
-}
-.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-handle {
- display: block;
- margin: 0;
- width: 16px;
- height: 9px;
- top: -3px;
- border: 0;
- background: url(controls-wmp.png) no-repeat 0 -80px;
-}
-.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-float {
- display: none;
-}
-.mejs-wmp .mejs-controls .mejs-playpause-button {
- top: 10px;
- left: 50%;
- margin: 10px 0 0 -20px;
- width: 40px;
- height: 40px;
-
-}
-.mejs-wmp .mejs-controls .mejs-playpause-button button {
- width: 40px;
- height: 40px;
- background: url(controls-wmp.png) no-repeat 0 0;
- margin: 0;
- padding: 0;
-}
-.mejs-wmp .mejs-controls .mejs-pause button {
- background-position: 0 -40px;
-}
-
-.mejs-wmp .mejs-controls .mejs-currenttime-container {
- position: absolute;
- top: 25px;
- left: 50%;
- margin-left: -93px;
-}
-.mejs-wmp .mejs-controls .mejs-duration-container {
- position: absolute;
- top: 25px;
- left: 50%;
- margin-left: -58px;
-}
-
-
-.mejs-wmp .mejs-controls .mejs-volume-button {
- top: 32px;
- right: 50%;
- margin-right: -55px;
- width: 20px;
- height: 15px;
-}
-.mejs-wmp .mejs-controls .mejs-volume-button button {
- margin: 0;
- padding: 0;
- background: url(controls-wmp.png) no-repeat -42px -17px;
- width: 20px;
- height: 15px;
-}
-.mejs-wmp .mejs-controls .mejs-unmute button {
- margin: 0;
- padding: 0;
- background: url(controls-wmp.png) no-repeat -42px 0;
- width: 20px;
- height: 15px;
-}
-.mejs-wmp .mejs-controls .mejs-volume-button .mejs-volume-slider {
- background: rgba(102,102,102,0.6);
-}
-
-.mejs-wmp .mejs-controls .mejs-fullscreen-button {
- top: 32px;
- right: 50%;
- margin-right: -82px;
- width: 15px;
- height: 14px;
-}
-.mejs-wmp .mejs-controls .mejs-fullscreen-button button {
- margin: 0;
- padding: 0;
- background: url(controls-wmp.png) no-repeat -63px 0;
- width: 15px;
- height: 14px;
-}
-.mejs-wmp .mejs-controls .mejs-captions-button {
- display: none;
-}
-/* END: WMP player */
-
-
-
diff --git a/src/main/webapp/static/movie/player.js b/src/main/webapp/static/movie/player.js
index d477ea43974..79f2783768a 100644
--- a/src/main/webapp/static/movie/player.js
+++ b/src/main/webapp/static/movie/player.js
@@ -94,27 +94,17 @@ var BPlayer = {
.attr('href', mediaElementBaseUrl + 'mediaelementplayer.min.css');
}
- if(BPlayer.isIE8()) {
- jQuery('<script></script>')
- .appendTo('head')
- .attr({ type : 'text/javascript'})
- .attr('src', mediaElementBaseUrl + 'mediaelement-and-player.min.js');
- setTimeout(function() {
- BPlayer.insertHTML5MediaElementPlayerWorker(domId, args);
- }, 700)
+ if(typeof jQuery('body').mediaelementplayer != 'undefined') {
+ BPlayer.insertHTML5MediaElementPlayerWorker(domId, args);
} else {
- if(typeof jQuery('body').mediaelementplayer != 'undefined') {
+ jQuery.ajax({
+ dataType: 'script',
+ cache: true,
+ async: false,//prevent 2x load of the mediaelement.js which is deadly
+ url: mediaElementBaseUrl + 'mediaelement-and-player.min.js'
+ }).done(function() {
BPlayer.insertHTML5MediaElementPlayerWorker(domId, args);
- } else {
- jQuery.ajax({
- dataType: 'script',
- cache: true,
- async: false,//prevent 2x load of the mediaelement.js which is deadly
- url: mediaElementBaseUrl + 'mediaelement-and-player.min.js'
- }).done(function() {
- BPlayer.insertHTML5MediaElementPlayerWorker(domId, args);
- });
- }
+ });
}
}
},
@@ -208,6 +198,8 @@ var BPlayer = {
}
var content;
+ var mediaDomId = domId + '_oo' + Math.floor(Math.random() * 1000000) + 'vid';
+ var objectDomId = domId + '_oo' + Math.floor(Math.random() * 1000000) + 'obj';
if(config.provider == "sound") {
if(config.height) {
meConfig.audioHeight = config.height;
@@ -215,27 +207,38 @@ var BPlayer = {
if(config.width) {
meConfig.audioWidth = config.width;
}
- content = "<audio id='" + domId + "_oovid' controls='controls' preload='none'>";
+ content = "<audio id='" + mediaDomId + "' controls='controls' preload='none'>";
content += "<source type='" +mimeType + "' src='" + config.file + "' /></audio>";
} else {
//controls are mandatory for Safari at least
- content = "<video id='" + domId + "_oovid' controls='controls' preload='none'";
- if(config.height) {
+ content = "<video id='" + mediaDomId + "' controls='controls' preload='none'";
+ var objContent = "<object id='" + objectDomId + "' type='application/x-shockwave-flash'";
+ if(typeof config.height != 'undefined') {
content += " height='" + config.height + "'";
+ objContent += " height='" + config.height + "'";
meConfig.videoHeight = config.height;
}
- if(config.width) {
+ if(typeof config.width != 'undefined') {
content += " width='" + config.width + "'";
+ objContent += " width='" + config.width + "'";
meConfig.videoWidth = config.width;
}
- if(config.image != 'undefined') {
+ if(typeof config.image != 'undefined') {
content += " poster='" + config.image + "'";
}
- content += "><source type='" +mimeType + "' src='" + config.file + "' /></video>";
+ content += "><source type='" +mimeType + "' src='" + config.file + "' />";
+
+ content += objContent + " data='" + mediaElementBaseUrl + "flashmediaelement.swf'>";
+ content += "<param name='movie' value='" + mediaElementBaseUrl + "flashmediaelement.swf' />";
+ content += "<param name='flashvars' value='controls=true";
+ if(typeof config.streamer != 'undefined') {
+ content += "&streamer=" + config.streamer;
+ }
+ content += "&file=" + config.file + "' /></object></video>";
}
jQuery('#' + domId).html(content);
- jQuery('#' + domId + '_oovid').mediaelementplayer(meConfig);
+ jQuery('#' + mediaDomId).mediaelementplayer(meConfig);
},
mediaElementBaseUrl: function() {
--
GitLab