L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2013-03-26 16:11:47 +08:00
parent 3dbfd15872 83cca3da87
commit 0231f91d86
11 changed files with 1070 additions and 1034 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/javascript-static.js
+5 -5
View File
@@ -1839,9 +1839,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.14.swf', width: video.width, height: video.height};
var src = {src: M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.16.swf', width: video.width, height: video.height};
} else {
var src = M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.14.swf';
var src = M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.16.swf';
}
flowplayer(video.id, src, {
plugins: {controls: controls},
@@ -1941,7 +1941,7 @@ M.util.load_flowplayer = function() {
controls.height = 25;
controls.time = true;
}
flowplayer(audio.id, M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.14.swf', {
flowplayer(audio.id, M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.16.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}
});
@@ -1949,9 +1949,9 @@ M.util.load_flowplayer = function() {
}
if (M.cfg.jsrev == -1) {
var jsurl = M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.11.js';
var jsurl = M.cfg.wwwroot + '/lib/flowplayer/flowplayer-3.2.12.js';
} else {
var jsurl = M.cfg.wwwroot + '/lib/javascript.php?jsfile=/lib/flowplayer/flowplayer-3.2.11.min.js&rev=' + M.cfg.jsrev;
var jsurl = M.cfg.wwwroot + '/lib/javascript.php?jsfile=/lib/flowplayer/flowplayer-3.2.12.min.js&rev=' + M.cfg.jsrev;
}
var fileref = document.createElement('script');
fileref.setAttribute('type','text/javascript');