MDL-35185 import Flowplayer 3.2.14

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

View File

@ -1,8 +1,35 @@
Version history:
3.2.13
------
- Updated to automatically load the latest controls and audio plugins
3.2.12
------
- new flowplayer.js version 3.2.11,
fixes removing the player in fullscreen mode leaves Android locked in landscape orientation (#511)
- #586 add a bitrate label with a new namespace attribute fp:bitratelabel.
- #583 fixes for handling the fullscreenOnly property better
- #494 with relative filenames with a root path strip the baseurl of paths first.
3.2.11
------
- new flowplayer.js, now requires Flash 10.1 as the minimum flash version
- #526 allow click through event for flash installation message when using div containers.
- #508 disabling the stagevideo screen mask, canvas is visible without it, this was causing issues with the display list.
- #443 adding accessibility option to the playbuttonoverlay.
3.2.10
------
- Fixed #514, scrubbing was broken
- new flowplayer.js version 3.2.9, fixes #510
3.2.9
-----
- Fixed #490, controlbar background, buffer bar and progress bar colors were all reset to white
- #503 Update viewport when stage is added to obtain the coordnates correctly. Update viewport when in and out of fullscreen.
- #508 stage video mask was being added to the top layer and hiding all children.
3.2.8
-----
@ -69,6 +96,7 @@ this.loadPlugin("content","../flowplayer.content.swf", { html: "test" }, functi
- #461 when we have a clip base url set, we need the complete clip url sent to play2 for http streams.
- #470 check for a playlist when replacing the playlist with an rss feed.
- #494 regression issued caused by #412, enable base url correctly.
- #30 regression caused by character replacements, removing for now and let end user deal with them.
3.2.7
-----

View File

@ -1,5 +1,18 @@
Version history:
3.2.10
------
- #575 send the start event after begin
- #569 if the playlist has been reset but the audio has been already buffered, set the duration and start event.
- #582 fixes for metadata events dispatching in playlists and when replaying same audio item, cleanup duration updating once download has completed,
fixes for clearing the previous cover image display.
- #611 close the channel and sound on stream not found errors.
3.2.9
-----
- #501 fixes to dispatch start state correctly.
- #501 use the sound channel to listen for a complete event to finish correctly.
3.2.8
-----
Fixes:

View File

@ -1,5 +1,5 @@
/*
* flowplayer.js 3.2.8. The Flowplayer API
* flowplayer.js 3.2.11. The Flowplayer API
*
* Copyright 2009-2011 Flowplayer Oy
*
@ -18,8 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Flowplayer. If not, see <http://www.gnu.org/licenses/>.
*
* Date: 2011-12-30 12:34:08 -0500 (Fri, 30 Dec 2011)
* Revision: 761
* Date: 2012-06-16 10:34:45 -0400 (Sat, 16 Jun 2012)
* Revision: 808
*/
(function () {
function g(o) {
@ -373,6 +373,9 @@
D = true;
try {
if (v) {
if (v.fp_isFullscreen()) {
v.fp_toggleFullscreen()
}
v.fp_close();
w._fireEvent("onUnload")
}
@ -468,7 +471,7 @@
}
return w
}, getVersion:function () {
var I = "flowplayer.js 3.2.8";
var I = "flowplayer.js 3.2.11";
if (w.isLoaded()) {
var H = v.fp_getVersion();
H.push(I);
@ -615,7 +618,7 @@
return P
};
function B() {
q.innerHTML = ''; // Moodle hack - we do not want splashscreens, unfortunately there is not switch to disable them
q.innerHTML=''; // Moodle hack - we do not want splashscreens, unfortunately there is not switch to disable them
if ($f(q)) {
$f(q).getParent().innerHTML = "";
p = $f(q).getIndex();
@ -776,7 +779,7 @@
if (typeof t == "string") {
t = {src:t}
}
t = i({bgcolor:"#000000", version:[9, 0], expressInstall:"http://static.flowplayer.org/swf/expressinstall.swf", cachebusting:false}, t);
t = i({bgcolor:"#000000", version:[10, 1], expressInstall:"http://releases.flowplayer.org/swf/expressinstall.swf", cachebusting:false}, t);
if (typeof o == "string") {
if (o.indexOf(".") != -1) {
var s = [];
@ -823,7 +826,7 @@
}
})();
(function () {
var h = document.all, j = "http://www.adobe.com/go/getflashplayer", c = typeof jQuery == "function", e = /(\d+)[^\d]+(\d+)[^\d]*(\d*)/, b = {width:"100%", height:"100%", id:"_" + ("" + Math.random()).slice(9), allowfullscreen:true, allowscriptaccess:"always", quality:"high", version:[3, 0], onFail:null, expressInstall:null, w3c:false, cachebusting:false};
var h = document.all, j = "http://get.adobe.com/flashplayer", c = typeof jQuery == "function", e = /(\d+)[^\d]+(\d+)[^\d]*(\d*)/, b = {width:"100%", height:"100%", id:"_" + ("" + Math.random()).slice(9), allowfullscreen:true, allowscriptaccess:"always", quality:"high", version:[3, 0], onFail:null, expressInstall:null, w3c:false, cachebusting:false};
if (window.attachEvent) {
window.attachEvent("onbeforeunload", function () {
__flash_unloadHandler = function () {
@ -882,7 +885,7 @@
}
}
f = e.exec(f);
return f ? [f[1], f[3]] : [0, 0]
return f ? [1 * f[1], 1 * f[(f[1] * 1 > 9 ? 2 : 3)] * 1] : [0, 0]
}, asString:function (l) {
if (l === null || l === undefined) {
return null
@ -895,13 +898,11 @@
case"string":
l = l.replace(new RegExp('(["\\\\])', "g"), "\\$1");
l = l.replace(/^\s?(\d+\.?\d*)%/, "$1pct");
l = l.replace(/(%)/g, "%25").replace(/'/g, "\\u0027").replace(/"/g, "\\u0022").replace(/&/g, "%26");
return'"' + l + '"';
case"array":
return"[" + a(l,
function (o) {
return g.asString(o)
}).join(",") + "]";
return"[" + a(l,function (o) {
return g.asString(o)
}).join(",") + "]";
case"function":
return'"function()"';
case"object":
@ -963,7 +964,7 @@
} else {
if (!f.innerHTML.replace(/\s/g, "")) {
f.innerHTML = "<h2>Flash version " + n.version + " or greater is required</h2><h3>" + (k[0] > 0 ? "Your version is " + k : "You have no flash plugin installed") + "</h3>" + (f.tagName == "A" ? "<p>Click here to download latest version</p>" : "<p>Download latest version from <a href='" + j + "'>here</a></p>");
if (f.tagName == "A") {
if (f.tagName == "A" || f.tagName == "DIV") {
f.onclick = function () {
location.href = j
}
@ -992,7 +993,7 @@
}
if (c) {
jQuery.tools = jQuery.tools || {version:"3.2.8"};
jQuery.tools = jQuery.tools || {version:"3.2.11"};
jQuery.tools.flashembed = {conf:b};
jQuery.fn.flashembed = function (l, f) {
return this.each(function () {

24
lib/flowplayer/flowplayer-3.2.11.min.js vendored Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

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');

View File

@ -88,7 +88,7 @@
<location>flowplayer</location>
<name>Flowplayer</name>
<license>GPL</license>
<version>3.2.9</version>
<version>3.2.14</version>
<licenseversion>3</licenseversion>
</library>
<library>