EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed video

namespaces
Frode Petterson 2013-02-25 14:15:52 +01:00
parent f40302b8b6
commit 6daf5ce803
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/h5p.js
View File

@ -63,7 +63,7 @@ H5P.Coords = function(x, y, w, h) {
// function to call when finished. // function to call when finished.
// //
// TODO: Try to get rid of content path. // TODO: Try to get rid of content path.
H5P.playVideo = function ($target, params, cp, onEnded) { H5P.playVideo = function ($target, params, skipButtonText, cp, onEnded) {
var $ = H5P.jQuery; var $ = H5P.jQuery;
var width = 635, // TODO: These should come from some dimension setting. var width = 635, // TODO: These should come from some dimension setting.
@ -87,13 +87,14 @@ H5P.playVideo = function ($target, params, cp, onEnded) {
video.height = height; video.height = height;
if (video.canPlayType !== undefined) { if (video.canPlayType !== undefined) {
for (var key in params) { for (var i = 0; i < params.length; i++) {
var file = params[i];
// TODO: The files should probably be in their own group. // TODO: The files should probably be in their own group.
if (key.indexOf('video') === 0) { if (file.mime.indexOf('video') === 0) {
if (video.canPlayType(key)) { if (video.canPlayType(file.mime)) {
var source = document.createElement('source'); var source = document.createElement('source');
source.src = cp + params[key]; source.src = cp + file.path;
source.type = key; source.type = file.mime;
video.appendChild(source); video.appendChild(source);
willWork = willWork || true; willWork = willWork || true;
} }
@ -107,7 +108,7 @@ H5P.playVideo = function ($target, params, cp, onEnded) {
}); });
} }
} }
var fplayer = undefined; var fplayer = undefined;
if (!willWork) { if (!willWork) {
// use flowplayer fallback // use flowplayer fallback
@ -122,10 +123,10 @@ H5P.playVideo = function ($target, params, cp, onEnded) {
}, { }, {
buffering: true, buffering: true,
clip: { clip: {
url: window.location.protocol + '//' + window.location.host + cp + params['video/mp4'], url: window.location.protocol + '//' + window.location.host + cp + params[0].path,
autoPlay: true, autoPlay: true,
autoBuffering: true, autoBuffering: true,
onFinish: function (ev) { onFinish: function () {
onEnded(); onEnded();
}, },
onError: function () { onError: function () {
@ -144,8 +145,8 @@ H5P.playVideo = function ($target, params, cp, onEnded) {
return; return;
} }
if (params.skipButtonText) { if (skipButtonText) {
var $skipButton = $('<a class="button skip">' + params.skipButtonText + '</a>').click(function (ev) { var $skipButton = $('<a class="button skip">' + skipButtonText + '</a>').click(function (ev) {
if (fplayer !== undefined) { if (fplayer !== undefined) {
// Must stop this first. Errorama if we don't // Must stop this first. Errorama if we don't
fplayer.stop().close().unload(); fplayer.stop().close().unload();