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

Resolve conflicts

namespaces
Svein-Tore Griff With 2013-02-27 22:49:56 +01:00
parent 71763222e2 ad828c1984
commit 517f7e6e9d
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
h5p.classes.php
View File

@ -164,6 +164,7 @@ class H5PValidator {
'machineName' => '/^[\w0-9\-\.]{1,255}$/i',
'majorVersion' => '/^[0-9]{1,5}$/',
'minorVersion' => '/^[0-9]{1,5}$/',
'defaultStyles' => 'boolean',
),
'mainLibrary' => '/^[$a-z_][0-9a-z_\.$]{1,254}$/i',
'embedTypes' => array('iframe', 'div'),
@ -178,6 +179,7 @@ class H5PValidator {
'machineName' => '/^[\w0-9\-\.]{1,255}$/i',
'majorVersion' => '/^[0-9]{1,5}$/',
'minorVersion' => '/^[0-9]{1,5}$/',
'defaultStyles' => 'boolean',
),
'externalResources' => array(
'machineName' => '/^[\w0-9\-\.]{1,255}$/i',
@ -544,16 +546,24 @@ class H5PValidator {
$valid = TRUE;
if (is_string($requirement)) {
// The requirement is a regexp, match it against the data
if (is_string($h5pData) || is_int($h5pData)) {
if (preg_match($requirement, $h5pData) === 0) {
$this->h5pF->setErrorMessage($this->h5pF->t("Invalid data provided for %property in %library", array('%property' => $property_name, '%library' => $library_name)));
$valid = FALSE;
if ($requirement == 'boolean') {
if (!is_bool($h5pData)) {
$this->h5pF->setErrorMessage($this->h5pF->t("Invalid data provided for %property in %library. Boolean expected.", array('%property' => $property_name, '%library' => $library_name)));
$valid = FALSE;
}
}
else {
$this->h5pF->setErrorMessage($this->h5pF->t("Invalid data provided for %property in %library", array('%property' => $property_name, '%library' => $library_name)));
$valid = FALSE;
// The requirement is a regexp, match it against the data
if (is_string($h5pData) || is_int($h5pData)) {
if (preg_match($requirement, $h5pData) === 0) {
$this->h5pF->setErrorMessage($this->h5pF->t("Invalid data provided for %property in %library", array('%property' => $property_name, '%library' => $library_name)));
$valid = FALSE;
}
}
else {
$this->h5pF->setErrorMessage($this->h5pF->t("Invalid data provided for %property in %library", array('%property' => $property_name, '%library' => $library_name)));
$valid = FALSE;
}
}
}
elseif (is_array($requirement)) {
@ -725,6 +735,7 @@ class H5PStorage {
$librariesInUse[$preloadedDependency['machineName']] = array(
'library' => $library,
'preloaded' => $dynamic ? 0 : 1,
'default_styles' => isset($preloadedDependency['defaultStyles']) && $preloadedDependency['defaultStyles'] ? 1 : 0,
);
$this->getLibraryUsage($librariesInUse, $library, $dynamic);
}

23
js/h5p.js
View File

@ -63,7 +63,7 @@ H5P.Coords = function(x, y, w, h) {
// function to call when finished.
//
// 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 width = 635, // TODO: These should come from some dimension setting.
@ -87,13 +87,14 @@ H5P.playVideo = function ($target, params, cp, onEnded) {
video.height = height;
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.
if (key.indexOf('video') === 0) {
if (video.canPlayType(key)) {
if (file.mime.indexOf('video') === 0) {
if (video.canPlayType(file.mime)) {
var source = document.createElement('source');
source.src = cp + params[key];
source.type = key;
source.src = cp + file.path;
source.type = file.mime;
video.appendChild(source);
willWork = willWork || true;
}
@ -107,7 +108,7 @@ H5P.playVideo = function ($target, params, cp, onEnded) {
});
}
}
var fplayer = undefined;
if (!willWork) {
// use flowplayer fallback
@ -122,10 +123,10 @@ H5P.playVideo = function ($target, params, cp, onEnded) {
}, {
buffering: true,
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,
autoBuffering: true,
onFinish: function (ev) {
onFinish: function () {
onEnded();
},
onError: function () {
@ -144,8 +145,8 @@ H5P.playVideo = function ($target, params, cp, onEnded) {
return;
}
if (params.skipButtonText) {
var $skipButton = $('<a class="button skip">' + params.skipButtonText + '</a>').click(function (ev) {
if (skipButtonText) {
var $skipButton = $('<a class="button skip">' + skipButtonText + '</a>').click(function (ev) {
if (fplayer !== undefined) {
// Must stop this first. Errorama if we don't
fplayer.stop().close().unload();