From 6c9634eae7ce5dab41e981de8738a30944b4146a Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Fri, 21 Mar 2014 09:37:39 +0100 Subject: [PATCH] HFJ-187: Fixed copyrights for boardgame and libraries used there. --- js/questionset.js | 46 ++++++++++++++++++++++++++++++++++++++++++++-- library.json | 3 +-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/js/questionset.js b/js/questionset.js index be05071..2809703 100644 --- a/js/questionset.js +++ b/js/questionset.js @@ -375,6 +375,47 @@ H5P.QuestionSet = function (options, contentId) { } 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. var returnObject = { @@ -386,7 +427,8 @@ H5P.QuestionSet = function (options, contentId) { }, totalScore: totalScore, reRender: reRender, - defaults: defaults // Provide defaults for inspection + defaults: defaults, // Provide defaults for inspection + getCopyrights: getCopyrights }; return returnObject; -}; \ No newline at end of file +}; diff --git a/library.json b/library.json index d42f9db..f172de4 100644 --- a/library.json +++ b/library.json @@ -3,8 +3,7 @@ "contentType": "question", "majorVersion": 1, "minorVersion": 0, - "patchVersion": 39, - "patchVersion": 42, + "patchVersion": 43, "runnable": 1, "fullscreen": 0, "machineName": "H5P.QuestionSet",