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

Revert "Merge pull request #11 from SergeyYukhnevich/add-override-of-check-button" 

This reverts commit 6c86c8ac9d, reversing
changes made to 976e9567c6.
pull/12/head
Frode Petterson 2017-06-12 11:07:31 +02:00
parent 6c86c8ac9d
commit e7e83f43ce
3 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/questionset.js
View File

@ -225,21 +225,20 @@ H5P.QuestionSet = function (options, contentId, contentData) {
var $template = $(template.render(params)); var $template = $(template.render(params));
// Set overrides for questions // Set overrides for questions
var override = {}; var override;
if (params.override.showSolutionButton || params.override.retryButton) {
override = {};
if (params.override.showSolutionButton) {
// Force "Show solution" button to be on or off for all interactions
override.enableSolutionsButton =
(params.override.showSolutionButton === 'on' ? true : false);
}
if (params.override.checkButton) { if (params.override.retryButton) {
// Force "Check" button to be on or off for all interactions // Force "Retry" button to be on or off for all interactions
override.enableCheck = params.override.checkButton === 'on'; override.enableRetry =
} (params.override.retryButton === 'on' ? true : false);
}
if (params.override.showSolutionButton) {
// Force "Show solution" button to be on or off for all interactions
override.enableSolutionsButton = params.override.showSolutionButton === 'on';
}
if (params.override.retryButton) {
// Force "Retry" button to be on or off for all interactions
override.enableRetry = params.override.retryButton === 'on';
} }
/** /**

4
library.json
View File

@ -4,7 +4,7 @@
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 13, "minorVersion": 13,
"patchVersion": 1, "patchVersion": 0,
"embedTypes": [ "embedTypes": [
"iframe" "iframe"
], ],
@ -61,4 +61,4 @@
"minorVersion": 2 "minorVersion": 2
} }
] ]
} }

22
semantics.json
View File

@ -418,28 +418,10 @@
{ {
"name": "override", "name": "override",
"type": "group", "type": "group",
"label": "Override settings for \"Check\", \"Show solution\" and \"Retry\" buttons", "label": "Settings for \"Show solution\" and \"Retry\" buttons",
"importance": "low", "importance": "low",
"optional": true, "optional": true,
"fields": [ "fields": [
{
"name": "checkButton",
"type": "select",
"label": "Override \"Check\" button",
"importance": "low",
"description": "This option determines if the \"Check\" button will be shown for all questions, disabled for all or configured for each question individually.",
"optional": true,
"options": [
{
"value": "on",
"label": "Enabled"
},
{
"value": "off",
"label": "Disabled"
}
]
},
{ {
"name": "showSolutionButton", "name": "showSolutionButton",
"type": "select", "type": "select",
@ -478,4 +460,4 @@
} }
] ]
} }
] ]