From bfa29df4c68db8b815cf8e7a020221ba84227475 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Mon, 5 Sep 2016 14:37:20 +0200 Subject: [PATCH 1/3] Bumped h5p-drag-n-bar and all dependent libraries --- library.json | 6 +++--- semantics.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library.json b/library.json index fac3d5c..b83a392 100644 --- a/library.json +++ b/library.json @@ -3,8 +3,8 @@ "description": "Put together a set of different questions that has to be solved. (Quiz)", "contentType": "question", "majorVersion": 1, - "minorVersion": 8, - "patchVersion": 4, + "minorVersion": 9, + "patchVersion": 0, "embedTypes": [ "iframe" ], @@ -61,4 +61,4 @@ "minorVersion": 1 } ] -} \ No newline at end of file +} diff --git a/semantics.json b/semantics.json index a29b346..e7c165b 100644 --- a/semantics.json +++ b/semantics.json @@ -111,7 +111,7 @@ "description": "Library for this question.", "options": [ "H5P.MultiChoice 1.7", - "H5P.DragQuestion 1.6", + "H5P.DragQuestion 1.7", "H5P.Blanks 1.6", "H5P.MarkTheWords 1.6", "H5P.DragText 1.5" From ebd2314a5c1f8c4e86d760279e274c7d2608f964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20J=C3=B8rgensen?= Date: Thu, 6 Oct 2016 21:47:40 +0200 Subject: [PATCH 2/3] Added H5P.TrueFalse to QS [HFP-6] --- semantics.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/semantics.json b/semantics.json index eaaa265..91ab898 100644 --- a/semantics.json +++ b/semantics.json @@ -114,7 +114,8 @@ "H5P.DragQuestion 1.7", "H5P.Blanks 1.7", "H5P.MarkTheWords 1.6", - "H5P.DragText 1.5" + "H5P.DragText 1.5", + "H5P.TrueFalse 1.0" ] } }, From e510b662ed450a5fc3948b85502b943117692e29 Mon Sep 17 00:00:00 2001 From: thomasmars Date: Fri, 7 Oct 2016 13:38:39 +0200 Subject: [PATCH 3/3] Restore at last page if in solution mode HFP-9 --- js/questionset.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/js/questionset.js b/js/questionset.js index 1e18f63..cd9727a 100644 --- a/js/questionset.js +++ b/js/questionset.js @@ -881,17 +881,15 @@ H5P.QuestionSet = function (options, contentId, contentData) { /** * Returns the complete state of question set and sub-content * - * @returns {Object} + * @returns {Object} current state */ this.getCurrentState = function () { - var state = { - progress: currentQuestion, + return { + progress: showingSolutions ? questionInstances.length - 1 : currentQuestion, answers: questionInstances.map(function (qi) { return qi.getCurrentState(); }) }; - - return state; }; };