mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-25 00:02:18 +02:00
Code Issues Projects Releases Wiki Activity

MDL-35185 import Flowplayer 3.2.14

Browse Source
This commit is contained in:
Petr Škoda
2012-09-02 15:11:57 +02:00
parent 569f1ad63b
commit 1dd274dc21
13 changed files with 89 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/javascript-static.js
View File

@@ -1754,9 +1754,9 @@ M.util.load_flowplayer = function() {
for(var i=0; i<M.util.video_players.length; i++) {
var video = M.util.video_players[i];
if (video.width > 0 && video.height > 0) {
var src = {src: M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.9.swf', width: video.width, height: video.height};
var src = {src: M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.14.swf', width: video.width, height: video.height};
} else {
var src = M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.9.swf';
var src = M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.14.swf';
}
flowplayer(video.id, src, {
plugins: {controls: controls},
@@ -1856,17 +1856,17 @@ M.util.load_flowplayer = function() {
controls.height = 25;
controls.time = true;
}
flowplayer(audio.id, M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.9.swf', {
plugins: {controls: controls, audio: {url: M.cfg.wwwroot + '/lib/flowplayer/flowplayer.audio-3.2.8.swf'}},
flowplayer(audio.id, M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.14.swf', {
plugins: {controls: controls, audio: {url: M.cfg.wwwroot + '/lib/flowplayer/flowplayer.audio-3.2.10.swf'}},
clip: {url: audio.fileurl, provider: "audio", autoPlay: false}
});
}
}
if (M.cfg.jsrev == -10) {
var jsurl = M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.8.min.js';
if (M.cfg.jsrev == -1) {
var jsurl = M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.11.js';
} else {
var jsurl = M.cfg.wwwroot + '/lib/javascript.php?jsfile=/lib/flowplayer/flowplayer-3.2.8.min.js&rev=' + M.cfg.jsrev;
var jsurl = M.cfg.wwwroot + '/lib/javascript.php?jsfile=/lib/flowplayer/flowplayer-3.2.11.min.js&rev=' + M.cfg.jsrev;
}
var fileref = document.createElement('script');
fileref.setAttribute('type','text/javascript');