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

Merge branch 'master' into api-1.1

pull/1/head
Pål Jørgensen 2014-04-02 15:17:25 +02:00
parent 8088b40bab 31ddbd8379
commit 8f62a51fe5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/questionset.js
View File

@ -365,7 +365,7 @@ H5P.QuestionSet = function (options, contentId) {
var info = new H5P.ContentCopyrights(); var info = new H5P.ContentCopyrights();
// Background // Background
if (params.backgroundImage.copyright !== undefined) { if (params.backgroundImage !== undefined && params.backgroundImage.copyright !== undefined) {
var background = new H5P.MediaCopyright(params.backgroundImage.copyright); 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)); background.setThumbnail(new H5P.Thumbnail(H5P.getPath(params.backgroundImage.path, contentId), params.backgroundImage.width, params.backgroundImage.height));
info.addMedia(background); info.addMedia(background);
@ -384,15 +384,19 @@ H5P.QuestionSet = function (options, contentId) {
} }
// Success video // Success video
var video = params.endGame.successVideo[0]; if (params.endGame.successVideo !== undefined && params.endGame.successVideo.length > 0) {
if (video.copyright !== undefined) { var video = params.endGame.successVideo[0];
info.addMedia(new H5P.MediaCopyright(video.copyright)); if (video.copyright !== undefined) {
info.addMedia(new H5P.MediaCopyright(video.copyright));
}
} }
// Fail video // Fail video
video = params.endGame.failVideo[0]; if (params.endGame.failVideo !== undefined && params.endGame.failVideo.length > 0) {
if (video.copyright !== undefined) { video = params.endGame.failVideo[0];
info.addMedia(new H5P.MediaCopyright(video.copyright)); if (video.copyright !== undefined) {
info.addMedia(new H5P.MediaCopyright(video.copyright));
}
} }
return info; return info;