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

Merge branch 'release'

pull/2/head
falcon 2015-10-01 09:41:34 +02:00
parent b00490bbe6 a6299e94e4
commit 0b7d2e2b36
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/questionset.css
View File

@ -220,3 +220,9 @@
.h5p-no-frame .questionset .h5p-question > *:last-child { .h5p-no-frame .questionset .h5p-question > *:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
/* Hide retry and show solution buttons */
.questionset .h5p-question .h5p-question-try-again,
.questionset .h5p-question .h5p-question-show-solution {
display: none;
}

11
js/questionset.js
View File

@ -363,12 +363,21 @@ H5P.QuestionSet = function (options, contentId) {
} }
} }
var registerImageLoadedListener = function (question) {
H5P.on(question, 'imageLoaded', function () {
self.trigger('resize');
});
};
// Attach questions // Attach questions
for (var i = 0; i < questionInstances.length; i++) { for (var i = 0; i < questionInstances.length; i++) {
var question = questionInstances[i]; var question = questionInstances[i];
question.attach($('.question-container:eq(' + i + ')', $myDom)); question.attach($('.question-container:eq(' + i + ')', $myDom));
// Listen for image resize
registerImageLoadedListener(question);
// Disable feedback for question // Disable feedback for question
question.setBehaviour({disableFeedback: true}); question.setBehaviour({disableFeedback: true});
@ -378,7 +387,7 @@ H5P.QuestionSet = function (options, contentId) {
// Add finish question set button // Add finish question set button
question.addButton('finish', params.texts.finishButton, function () { question.addButton('finish', params.texts.finishButton, function () {
_displayEndGame(); _displayEndGame();
}); }, false);
} else { } else {

6
library.json
View File

@ -3,8 +3,8 @@
"description": "Put together a set of different questions that has to be solved. (Quiz)", "description": "Put together a set of different questions that has to be solved. (Quiz)",
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 4, "minorVersion": 5,
"patchVersion": 2, "patchVersion": 0,
"embedTypes": [ "embedTypes": [
"iframe" "iframe"
], ],
@ -46,7 +46,7 @@
{ {
"machineName": "H5P.JoubelUI", "machineName": "H5P.JoubelUI",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 1 "minorVersion": 2
} }
], ],
"editorDependencies": [ "editorDependencies": [

10
semantics.json
View File

@ -106,11 +106,11 @@
"label": "Question type", "label": "Question type",
"description": "Library for this question.", "description": "Library for this question.",
"options": [ "options": [
"H5P.MultiChoice 1.3", "H5P.MultiChoice 1.4",
"H5P.DragQuestion 1.4", "H5P.DragQuestion 1.5",
"H5P.Blanks 1.3", "H5P.Blanks 1.4",
"H5P.MarkTheWords 1.3", "H5P.MarkTheWords 1.4",
"H5P.DragText 1.3" "H5P.DragText 1.4"
] ]
} }
}, },