EDUCATIC
/
h5p-question-set
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into api-1.2 

Conflicts:
	example_content/coursepresentation/H5P.CoursePresentation/library.json
	example_content/coursepresentation/H5P.Image/library.json
	example_content/interactive-video/H5P.InteractiveVideo/library.json
	example_content/interactive-video/H5P.InteractiveVideo/scripts/interactive-video.js
pull/1/head
Frode Petterson 2014-03-21 12:26:58 +01:00
parent 36237099d6 4171fd0327
commit 2d95ac1d7a
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
js/questionset.js
View File

@ -356,6 +356,47 @@ H5P.QuestionSet = function (options, contentId) {
return score; return score;
}; };
/**
* Gather copyright information for the current content.
*
* @returns {H5P.ContentCopyrights}
*/
var getCopyrights = function () {
var info = new H5P.ContentCopyrights();
// Background
if (params.backgroundImage.copyright !== undefined) {
var background = new H5P.MediaCopyright(params.backgroundImage.copyright);
background.setThumbnail(new H5P.Thumbnail(H5P.getPath(params.backgroundImage.path, contentId), params.backgroundImage.width, params.backgroundImage.height));
info.addMedia(background);
}
// Questions
for (var i = 0; i < questionInstances.length; i++) {
var questionInstance = questionInstances[i];
if (questionInstance.getCopyrights !== undefined) {
var rights = questionInstance.getCopyrights();
if (rights !== undefined) {
info.addContent(rights);
}
}
}
// Success video
var video = params.endGame.successVideo[0];
if (video.copyright !== undefined) {
info.addMedia(new H5P.MediaCopyright(video.copyright));
}
// Fail video
video = params.endGame.failVideo[0];
if (video.copyright !== undefined) {
info.addMedia(new H5P.MediaCopyright(video.copyright));
}
return info;
}
// Masquerade the main object to hide inner properties and functions. // Masquerade the main object to hide inner properties and functions.
var returnObject = { var returnObject = {
attach: attach, // Attach to DOM object attach: attach, // Attach to DOM object
@ -366,7 +407,8 @@ H5P.QuestionSet = function (options, contentId) {
}, },
totalScore: totalScore, totalScore: totalScore,
reRender: reRender, reRender: reRender,
defaults: defaults // Provide defaults for inspection defaults: defaults, // Provide defaults for inspection
getCopyrights: getCopyrights
}; };
return returnObject; return returnObject;
}; };