From e2aa9d5a6b27d9ec8b8a4fbdb819b3142057456c Mon Sep 17 00:00:00 2001
From: thomasmars <thomasmars87@gmail.com>
Date: Mon, 12 Sep 2016 09:41:39 +0200
Subject: [PATCH 1/6] Bumped Blanks, MultiChoice and Video dependency.

---
 library.json   | 2 +-
 semantics.json | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library.json b/library.json
index b83a392..71c3737 100644
--- a/library.json
+++ b/library.json
@@ -41,7 +41,7 @@
     {
       "machineName": "H5P.Video",
       "majorVersion": 1,
-      "minorVersion": 2
+      "minorVersion": 3
     },
     {
       "machineName": "H5P.JoubelUI",
diff --git a/semantics.json b/semantics.json
index e7c165b..be5a854 100644
--- a/semantics.json
+++ b/semantics.json
@@ -110,9 +110,9 @@
       "label": "Question type",
       "description": "Library for this question.",
       "options": [
-        "H5P.MultiChoice 1.7",
+        "H5P.MultiChoice 1.8",
         "H5P.DragQuestion 1.7",
-        "H5P.Blanks 1.6",
+        "H5P.Blanks 1.7",
         "H5P.MarkTheWords 1.6",
         "H5P.DragText 1.5"
       ]
@@ -385,4 +385,4 @@
       }
     ]
   }
-]
+]
\ No newline at end of file

From 64cc55c0effe03721e3b6761a30f516e7b7e252a Mon Sep 17 00:00:00 2001
From: thomasmars <thomasmars87@gmail.com>
Date: Thu, 15 Sep 2016 12:36:48 +0200
Subject: [PATCH 2/6] Updated dependencies to support MC in VerticalTabs
 HFJ-2166

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 71c3737..c334485 100644
--- a/library.json
+++ b/library.json
@@ -53,7 +53,7 @@
     {
       "machineName": "H5PEditor.VerticalTabs",
       "majorVersion": 1,
-      "minorVersion": 1
+      "minorVersion": 2
     },
     {
       "machineName": "H5PEditor.QuestionSetTextualEditor",

From 49c1da36277eb145beeff20c19330df8c98e7765 Mon Sep 17 00:00:00 2001
From: thomasmars <thomasmars87@gmail.com>
Date: Mon, 26 Sep 2016 11:45:15 +0200
Subject: [PATCH 3/6] Added option for disabling backward navigation

HFP-5
---
 js/questionset.js | 15 ++++++++++-----
 library.json      |  2 +-
 semantics.json    | 10 +++++++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 912b8b3..7e7e645 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -38,7 +38,7 @@ H5P.QuestionSet = function (options, contentId) {
           '  <% } %>' +
           '  <div class="qs-footer">' +
           '    <div class="qs-progress">' +
-          '      <% if (progressType == "dots") { %>' +
+          '      <% if (progressType == "dots" && !disableBackwardsNavigation) { %>' +
           '        <ul class="dots-container" role="navigation">' +
           '          <% for (var i=0; i<questions.length; i++) { %>' +
           '            <li class="progress-item"><a href="#" class="progress-dot unanswered" ' +
@@ -113,7 +113,8 @@ H5P.QuestionSet = function (options, contentId) {
       retryButtonText: 'Retry',
       showAnimations: false,
       skipButtonText: 'Skip video'
-    }
+    },
+    disableBackwardsNavigation: false
   };
 
   var template = new EJS({text: texttemplate});
@@ -125,7 +126,7 @@ H5P.QuestionSet = function (options, contentId) {
   var $myDom;
   var scoreBar;
   var up;
-  renderSolutions = false;
+  var renderSolutions = false;
 
   var $template = $(template.render(params));
   // Set overrides for questions
@@ -325,9 +326,13 @@ H5P.QuestionSet = function (options, contentId) {
       _displayEndGame();
 
     }
-    else {
+    else if (!params.disableBackwardsNavigation || questionInstances[currentQuestion].getAnswerGiven()) {
+      // Allow movement if backward navigation enabled or answer given
       _showQuestion(currentQuestion + direction);
     }
+    else {
+      //TODO: Give an error message ? or disable/grey out previous button when not allowed
+    }
   };
 
   /**
@@ -594,7 +599,7 @@ H5P.QuestionSet = function (options, contentId) {
       }
 
       // Add previous question button
-      if (questionInstances[0] !== question) {
+      if (questionInstances[0] !== question && !params.disableBackwardsNavigation) {
         question.addButton('prev', '', moveQuestion.bind(this, -1), true, {
           href: '#', // Use href since this is a navigation button
           'aria-label': params.texts.prevButton
diff --git a/library.json b/library.json
index c334485..232a3be 100644
--- a/library.json
+++ b/library.json
@@ -4,7 +4,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 9,
-  "patchVersion": 0,
+  "patchVersion": 1,
   "embedTypes": [
     "iframe"
   ],
diff --git a/semantics.json b/semantics.json
index be5a854..eaaa265 100644
--- a/semantics.json
+++ b/semantics.json
@@ -193,6 +193,14 @@
       }
     ]
   },
+  {
+    "name": "disableBackwardsNavigation",
+    "type": "boolean",
+    "label": "Disable backwards navigation",
+    "description": "This option will only allow you to move forward in Question Set",
+    "optional": true,
+    "default": false
+  },
   {
     "name": "endGame",
     "type": "group",
@@ -385,4 +393,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]

From b50b2518e25191f97f131c766cb6443d393f996b Mon Sep 17 00:00:00 2001
From: thomasmars <thomasmars87@gmail.com>
Date: Mon, 26 Sep 2016 13:50:03 +0200
Subject: [PATCH 4/6] Added translations

HFP-5
---
 language/ar.json | 4 ++++
 language/de.json | 4 ++++
 language/fr.json | 4 ++++
 language/it.json | 4 ++++
 language/nb.json | 4 ++++
 language/nn.json | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/language/ar.json b/language/ar.json
index 247754b..3a9c5fc 100644
--- a/language/ar.json
+++ b/language/ar.json
@@ -103,6 +103,10 @@
         }
       ]
     },
+    {
+      "label": "Disable backwards navigation",
+      "description": "This option will only allow you to move forward in Question Set"
+    },
     {
       "label": "انتهاء المسابقة",
       "fields": [
diff --git a/language/de.json b/language/de.json
index 8c828f4..14b925f 100644
--- a/language/de.json
+++ b/language/de.json
@@ -108,6 +108,10 @@
         }
       ]
     },
+    {
+      "label": "Disable backwards navigation",
+      "description": "This option will only allow you to move forward in Question Set"
+    },
     {
       "label": "Quiz beendet",
       "fields": [
diff --git a/language/fr.json b/language/fr.json
index e11b512..7929026 100644
--- a/language/fr.json
+++ b/language/fr.json
@@ -108,6 +108,10 @@
         }
       ]
     },
+    {
+      "label": "Disable backwards navigation",
+      "description": "This option will only allow you to move forward in Question Set"
+    },
     {
       "label": "Quiz terminé",
       "fields": [
diff --git a/language/it.json b/language/it.json
index 3125ef1..e6a6f1a 100644
--- a/language/it.json
+++ b/language/it.json
@@ -103,6 +103,10 @@
         }
       ]
     },
+    {
+      "label": "Disable backwards navigation",
+      "description": "This option will only allow you to move forward in Question Set"
+    },
     {
       "label": "Quiz terminato",
       "fields": [
diff --git a/language/nb.json b/language/nb.json
index 17b8b6e..e436438 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -105,6 +105,10 @@
         }
       ]
     },
+    {
+      "label": "Slå av bakoverknapp",
+      "description": "Slå på for å nekte å gå tilbake i Question Set"
+    },
     {
       "label": "Spørsmålssett avslutning",
       "fields": [
diff --git a/language/nn.json b/language/nn.json
index 7904bc5..bf63599 100644
--- a/language/nn.json
+++ b/language/nn.json
@@ -105,6 +105,10 @@
         }
       ]
     },
+    {
+      "label": "Slå av bakoverknapp",
+      "description": "Slå på for å nekte å gå tilbake i Question Set"
+    },
     {
       "label": "Spørsmålssett avslutning",
       "fields": [

From a601a1014cb9bc56753fff2c03f52f8853fbb099 Mon Sep 17 00:00:00 2001
From: thomasmars <thomasmars87@gmail.com>
Date: Mon, 26 Sep 2016 15:19:53 +0200
Subject: [PATCH 5/6] Implemented save content user state in Question Set.

Set progress from previousState.
Set subContent data from previousState.
Toggle dots if they have been answered in previous state.
Implemented current state API call.
HFP-9
---
 js/questionset.js | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 7e7e645..b346c51 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -8,11 +8,12 @@ var H5P = H5P || {};
  *
  * @param {Array} options
  * @param {int} contentId
+ * @param {Object} contentData
  * @returns {H5P.QuestionSet} Instance
  */
-H5P.QuestionSet = function (options, contentId) {
+H5P.QuestionSet = function (options, contentId, contentData) {
   if (!(this instanceof H5P.QuestionSet)) {
-    return new H5P.QuestionSet(options, contentId);
+    return new H5P.QuestionSet(options, contentId, contentData);
   }
   H5P.EventDispatcher.call(this);
   var $ = H5P.jQuery;
@@ -127,6 +128,10 @@ H5P.QuestionSet = function (options, contentId) {
   var scoreBar;
   var up;
   var renderSolutions = false;
+  contentData = contentData || {};
+  if (contentData.previousState) {
+    currentQuestion = contentData.previousState.progress;
+  }
 
   var $template = $(template.render(params));
   // Set overrides for questions
@@ -159,8 +164,11 @@ H5P.QuestionSet = function (options, contentId) {
     question.params.overrideSettings = question.params.overrideSettings || {};
     question.params.overrideSettings.$confirmationDialogParent = $template.last();
     question.params.overrideSettings.instance = this;
-
-    var questionInstance = H5P.newRunnable(question, contentId, undefined, undefined, {parent: self});
+    var questionInstance = H5P.newRunnable(question, contentId, undefined, undefined,
+      {
+        previousState: contentData.previousState ? contentData.previousState.answers[i] : undefined,
+        parent: self
+      });
     questionInstance.on('resize', function () {
       up = true;
       self.trigger('resize');
@@ -624,6 +632,9 @@ H5P.QuestionSet = function (options, contentId) {
         }
         event.data.statement.context.extensions['http://id.tincanapi.com/extension/ending-point'] = currentQuestion + 1;
       });
+
+      // Mark question if answered
+      toggleAnsweredDot(i, question.getAnswerGiven());
     }
 
     // Allow other libraries to add transitions after the questions have been inited
@@ -680,12 +691,14 @@ H5P.QuestionSet = function (options, contentId) {
 
 
 
-    // Hide all but initial Question.
-    _showQuestion(params.initialQuestion, true);
+    // Hide all but current question
+    _showQuestion(currentQuestion, true);
 
     if (renderSolutions) {
       showSolutions();
     }
+    // Update buttons in case they have changed (restored user state)
+    _updateButtons();
 
     this.trigger('resize');
 
@@ -800,6 +813,22 @@ H5P.QuestionSet = function (options, contentId) {
       H5P.error(err);
     }
   };
+
+  /**
+   * Returns the complete state of question set and sub-content
+   *
+   * @returns {Object}
+   */
+  this.getCurrentState = function () {
+    var state = {
+      progress: currentQuestion,
+      answers: questionInstances.map(function (qi) {
+        return qi.getCurrentState();
+      })
+    };
+
+    return state;
+  };
 };
 
 H5P.QuestionSet.prototype = Object.create(H5P.EventDispatcher.prototype);

From d5eb0f50edd61ce50e6c91a628de26e27611ac12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=CC=8Akon=20Ellingsen?= <hakonweb@gmail.com>
Date: Wed, 28 Sep 2016 11:10:32 +0200
Subject: [PATCH 6/6] HFP-24: Only add skip button when it is wanted

---
 js/questionset.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index b346c51..63a18fb 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -524,7 +524,7 @@ H5P.QuestionSet = function (options, contentId, contentData) {
         });
         video.play();
 
-        if (params.endGame.skipButtonText) {
+        if (params.endGame.skippable) {
           $('<a class="h5p-joubelui-button h5p-button skip">' + params.endGame.skipButtonText + '</a>').click(function () {
             video.pause();
             $videoContainer.hide();