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

Merge branch 'release'

pull/35/head
Paal Joergensen 2018-09-11 14:55:33 +02:00
parent 07b5877c8f 0df99b3372
commit 2fc1b9a050
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/questionset.js
View File

@ -161,7 +161,9 @@ H5P.QuestionSet = function (options, contentId, contentData) {
var randomizeQuestionOrdering = function (questions) { var randomizeQuestionOrdering = function (questions) {
// Save the original order of the questions in a multidimensional array [[question0,0],[question1,1]... // Save the original order of the questions in a multidimensional array [[question0,0],[question1,1]...
var questionOrdering = questions.map(function (questionInstance, index) { return [questionInstance, index]; }); var questionOrdering = questions.map(function (questionInstance, index) {
return [questionInstance, index];
});
// Shuffle the multidimensional array // Shuffle the multidimensional array
questionOrdering = H5P.shuffleArray(questionOrdering); questionOrdering = H5P.shuffleArray(questionOrdering);
@ -463,7 +465,7 @@ H5P.QuestionSet = function (options, contentId, contentData) {
questionInstances[i].showSolutions(); questionInstances[i].showSolutions();
questionInstances[i].toggleReadSpeaker(false); questionInstances[i].toggleReadSpeaker(false);
} }
catch(error) { catch (error) {
H5P.error("subcontent does not contain a valid showSolutions function"); H5P.error("subcontent does not contain a valid showSolutions function");
H5P.error(error); H5P.error(error);
} }
@ -515,7 +517,7 @@ H5P.QuestionSet = function (options, contentId, contentData) {
questionInstances[i].hideButton('prev'); questionInstances[i].hideButton('prev');
} }
} }
catch(error) { catch (error) {
H5P.error("subcontent does not contain a valid resetTask function"); H5P.error("subcontent does not contain a valid resetTask function");
H5P.error(error); H5P.error(error);
} }
@ -553,7 +555,8 @@ H5P.QuestionSet = function (options, contentId, contentData) {
// Update buttons // Update buttons
initializeQuestion(); initializeQuestion();
} else if (params.randomQuestions) { }
else if (params.randomQuestions) {
randomizeQuestions(); randomizeQuestions();
} }
@ -1084,7 +1087,8 @@ H5P.QuestionSet = function (options, contentId, contentData) {
var questionCopyrights; var questionCopyrights;
for (var i = 0; i < questionInstances.length; i++) { for (var i = 0; i < questionInstances.length; i++) {
var instance = questionInstances[i]; var instance = questionInstances[i];
var qParams = params.questions[i].params; var instanceParams = params.questions[i].params;
questionCopyrights = undefined; questionCopyrights = undefined;
if (instance.getCopyrights !== undefined) { if (instance.getCopyrights !== undefined) {
@ -1094,13 +1098,16 @@ H5P.QuestionSet = function (options, contentId, contentData) {
if (questionCopyrights === undefined) { if (questionCopyrights === undefined) {
// Create a generic flat copyright list // Create a generic flat copyright list
questionCopyrights = new H5P.ContentCopyrights(); questionCopyrights = new H5P.ContentCopyrights();
H5P.findCopyrights(questionCopyrights, qParams, contentId); H5P.findCopyrights(questionCopyrights, instanceParams.params, contentId,{
metadata: instanceParams.metadata,
machineName: instanceParams.library.split(' ')[0]
});
} }
// Determine label // Determine label
var label = (params.texts.questionLabel + ' ' + (i + 1)); var label = (params.texts.questionLabel + ' ' + (i + 1));
if (qParams.contentName !== undefined) { if (instanceParams.params.contentName !== undefined) {
label += ': ' + qParams.contentName; label += ': ' + instanceParams.params.contentName;
} }
else if (instance.getTitle !== undefined) { else if (instance.getTitle !== undefined) {
label += ': ' + instance.getTitle(); label += ': ' + instance.getTitle();