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

Add parameter set as parameter 5 to new runnable, and blacklist libraries that already have a custom third parameter for their constructor

semantics-font
Svein-Tore Griff With 2015-03-22 20:39:16 +01:00
parent 9d38f83886
commit 8e113ff792
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/h5p.js
View File

@ -541,10 +541,10 @@ H5P.classFromName = function (name) {
* @param {Number} contentId * @param {Number} contentId
* @param {jQuery} $attachTo An optional element to attach the instance to. * @param {jQuery} $attachTo An optional element to attach the instance to.
* @param {Boolean} skipResize Optionally skip triggering of the resize event after attaching. * @param {Boolean} skipResize Optionally skip triggering of the resize event after attaching.
* @param {Object} The parent of this H5P * @param {Object} extras - extra params for the H5P content constructor
* @return {Object} Instance. * @return {Object} Instance.
*/ */
H5P.newRunnable = function (library, contentId, $attachTo, skipResize, parent) { H5P.newRunnable = function (library, contentId, $attachTo, skipResize, extras) {
var nameSplit, versionSplit; var nameSplit, versionSplit;
try { try {
nameSplit = library.library.split(' ', 2); nameSplit = library.library.split(' ', 2);
@ -575,15 +575,20 @@ H5P.newRunnable = function (library, contentId, $attachTo, skipResize, parent) {
return H5P.error('Unable to find constructor for: ' + library.library); return H5P.error('Unable to find constructor for: ' + library.library);
} }
var extras = {}; if (extras === undefined) {
extras = {};
}
if (library.uuid) { if (library.uuid) {
extras.uuid = library.uuid; extras.uuid = library.uuid;
} }
if (parent) {
extras.parent = parent;
}
// Some old library versions have their own custom third parameter. Make sure we don't send them the extras. They'll interpret it as something else
if (H5P.jQuery.inArray(library.library, ['H5P.CoursePresentation 1.0', 'H5P.CoursePresentation 1.1', 'H5P.CoursePresentation 1.2', 'H5P.CoursePresentation 1.3']) > -1) {
var instance = new constructor(library.params, contentId);
}
else {
var instance = new constructor(library.params, contentId, extras); var instance = new constructor(library.params, contentId, extras);
}
if (instance.$ === undefined) { if (instance.$ === undefined) {
instance.$ = H5P.jQuery(instance); instance.$ = H5P.jQuery(instance);
@ -595,8 +600,8 @@ H5P.newRunnable = function (library, contentId, $attachTo, skipResize, parent) {
if (instance.uuid === undefined && library.uuid) { if (instance.uuid === undefined && library.uuid) {
instance.uuid = library.uuid; instance.uuid = library.uuid;
} }
if (instance.parent === undefined && parent) { if (instance.parent === undefined && extras && extras.parent) {
instance.parent = parent; instance.parent = extras.parent;
} }
if ($attachTo !== undefined) { if ($attachTo !== undefined) {