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

d3summaryChart
Svein-Tore Griff With 2014-12-02 13:09:50 +01:00
commit 549216fd31
2 changed files with 7 additions and 7 deletions

View File

@ -95,7 +95,7 @@ H5P.QuestionSet = function (options, contentId) {
override: { override: {
overrideButtons: false, overrideButtons: false,
overrideShowSolutionButton: false, overrideShowSolutionButton: false,
overrideRetryButton: false overrideRetry: false
}, },
postUserStatistics: (H5P.postUserStatistics === true) postUserStatistics: (H5P.postUserStatistics === true)
}; };
@ -120,7 +120,7 @@ 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, {
enableRetry: params.override.overrideRetryButton, enableRetry: params.override.overrideRetry,
enableSolutionsButton: params.override.overrideShowSolutionButton enableSolutionsButton: params.override.overrideShowSolutionButton
}); });
} }

View File

@ -289,8 +289,8 @@
{ {
"name": "override", "name": "override",
"type": "group", "type": "group",
"label": "Settings for \"Show solution\" and \"Retry\" buttons", "label": "Settings for \"Show solution\" button and \"Retry\".",
"description": "These options will let you override when to display \"Show solution\" and \"Retry\" buttons in integrated h5p content.", "description": "These options will let you override when to display \"Show solution\" button and \"Retry\" in integrated h5p content.",
"optional": true, "optional": true,
"fields": [ "fields": [
{ {
@ -308,10 +308,10 @@
"default": false "default": false
}, },
{ {
"name": "overrideRetryButton", "name": "overrideRetry",
"type": "boolean", "type": "boolean",
"label": "Enable \"Retry\" buttons.", "label": "Enable \"Retry\".",
"description": "Enabling this option will make questions show the \"Retry\" button.", "description": "Enabling this option will make the user able to \"Retry\" .",
"default": false "default": false
} }
] ]