Merge branch 'override-buttons' of github.com:h5p/h5p-question-set into override-buttons

d3summaryChart
Svein-Tore Griff With 2014-12-04 12:44:56 +01:00
commit 3f7d5a52f8
2 changed files with 9 additions and 9 deletions

View File

@ -109,8 +109,6 @@ H5P.QuestionSet = function (options, contentId) {
var $myDom; var $myDom;
renderSolutions = false; renderSolutions = false;
// Instantiate question instances // Instantiate question instances
for (var i = 0; i < params.questions.length; i++) { for (var i = 0; i < params.questions.length; i++) {
var question = params.questions[i]; var question = params.questions[i];
@ -120,8 +118,10 @@ H5P.QuestionSet = function (options, contentId) {
if (params.override.overrideButtons) { if (params.override.overrideButtons) {
// Extend subcontent with the overrided settings. // Extend subcontent with the overrided settings.
$.extend(question.params, { $.extend(question.params, {
behaviour: {
enableRetry: params.override.overrideRetry, enableRetry: params.override.overrideRetry,
enableSolutionsButton: params.override.overrideShowSolutionButton enableSolutionsButton: params.override.overrideShowSolutionButton
}
}); });
} }

View File

@ -101,11 +101,11 @@
"label": "Question type", "label": "Question type",
"description": "Library for this question.", "description": "Library for this question.",
"options": [ "options": [
"H5P.MultiChoice 1.0", "H5P.MultiChoice 1.1",
"H5P.DragQuestion 1.0", "H5P.DragQuestion 1.1",
"H5P.Blanks 1.0", "H5P.Blanks 1.1",
"H5P.MarkTheWords 1.0", "H5P.MarkTheWords 1.1",
"H5P.DragText 1.0" "H5P.DragText 1.1"
] ]
} }
}, },