From ab76075acca2fe1ae06be54e37eb2c9cc6e0076b Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Fri, 8 Apr 2016 14:42:49 +0200
Subject: [PATCH] Converted progress dots to links + ARIA label

HFJ-1750
---
 js/questionset.js | 7 +++++--
 language/ar.json  | 4 ++++
 language/de.json  | 4 ++++
 language/fr.json  | 4 ++++
 language/it.json  | 4 ++++
 language/nb.json  | 4 ++++
 language/nn.json  | 4 ++++
 semantics.json    | 6 ++++++
 8 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index f0d2f04..7751382 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -40,7 +40,7 @@ H5P.QuestionSet = function (options, contentId) {
           '      <% if (progressType == "dots") { %>' +
           '        <div class="dots-container">' +
           '          <% for (var i=0; i<questions.length; i++) { %>' +
-          '          <span class="progress-dot unanswered"></span>' +
+          '            <a href="#" class="progress-dot unanswered" aria-label="<%= questions[i].jumpAriaLabel %>"></a>' +
           '          <%} %>' +
           '        </div>' +
           '      <% } else if (progressType == "textual") { %>' +
@@ -79,7 +79,8 @@ H5P.QuestionSet = function (options, contentId) {
       prevButton: 'Previous',
       nextButton: 'Next',
       finishButton: 'Finish',
-      textualProgress: 'Question: @current of @total questions'
+      textualProgress: 'Question: @current of @total questions',
+      jumpToQuestion: 'Jump to question %d'
     },
     endGame: {
       showResultPage: true,
@@ -129,6 +130,7 @@ H5P.QuestionSet = function (options, contentId) {
   for (var i = 0; i < params.questions.length; i++) {
     var question = params.questions[i];
 
+    question.jumpAriaLabel = params.text.jumpToQuestion.replace(':num', i + 1);
     if (override) {
       // Extend subcontent with the overrided settings.
       $.extend(question.params.behaviour, override);
@@ -473,6 +475,7 @@ H5P.QuestionSet = function (options, contentId) {
     $('.progress-dot', $myDom).click(function () {
       _stopQuestion(currentQuestion);
       _showQuestion($(this).index());
+      return false;
     });
 
     // Hide all but initial Question.
diff --git a/language/ar.json b/language/ar.json
index b2b1edd..d30f285 100644
--- a/language/ar.json
+++ b/language/ar.json
@@ -74,6 +74,10 @@
         {
           "label": "نص التقدم",
           "description": "النص المستخدم إذا تم تحديد التقدم نصيا"
+        },
+        {
+          "label": "Label for jumping to a certain question",
+          "default": "Jump to question %d"
         }
       ]
     },
diff --git a/language/de.json b/language/de.json
index b1b9bc8..7fa6505 100644
--- a/language/de.json
+++ b/language/de.json
@@ -79,6 +79,10 @@
           "label": "Fortschrittstext",
           "description": "Verwendeter Text wenn Text Fortschrittsanzeige gewählt wurde.",
           "default": "Aktuelle Frage: @current von @total Fragen"
+        },
+        {
+          "label": "Label for jumping to a certain question",
+          "default": "Jump to question %d"
         }
       ]
     },
diff --git a/language/fr.json b/language/fr.json
index 7d01efc..03cc866 100644
--- a/language/fr.json
+++ b/language/fr.json
@@ -74,6 +74,10 @@
         {
           "label": "Texte de progression",
           "description": "Texte utilisé si la progression textuelle est utilisée."
+        },
+        {
+          "label": "Label for jumping to a certain question",
+          "default": "Jump to question %d"
         }
       ]
     },
diff --git a/language/it.json b/language/it.json
index bc2725e..3a59363 100644
--- a/language/it.json
+++ b/language/it.json
@@ -74,6 +74,10 @@
         {
           "label": "Testo Avanzamento",
           "description": "esto utilizzato se il testo Avanzamento è selezionato."
+        },
+        {
+          "label": "Label for jumping to a certain question",
+          "default": "Jump to question %d"
         }
       ]
     },
diff --git a/language/nb.json b/language/nb.json
index 880001d..f2fc642 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -76,6 +76,10 @@
           "label": "Fremdriftstekst",
           "description": "Tekst brukt hvis tekstlig angivelse av fremdrift er valgt. Variabler: @current og @total",
           "default": "Deloppgave @current av @total"
+        },
+        {
+          "label": "Merkelapp ved hopping til spørsmål",
+          "default": "Hopp til spørsmål %d"
         }
       ]
     },
diff --git a/language/nn.json b/language/nn.json
index 216333e..b33561d 100644
--- a/language/nn.json
+++ b/language/nn.json
@@ -76,6 +76,10 @@
           "label": "Fremdriftstekst",
           "description": "Tekst brukt hvis tekstlig angivelse av fremdrift er valgt. Variabler: @current og @total",
           "default": "Deloppgave @current av @total"
+        },
+        {
+          "label": "Merkelapp ved hopping til spørsmål",
+          "default": "Hopp til spørsmål %d"
         }
       ]
     },
diff --git a/semantics.json b/semantics.json
index d670e08..49b0cc9 100644
--- a/semantics.json
+++ b/semantics.json
@@ -152,6 +152,12 @@
           "strong",
           "em"
         ]
+      },
+      {
+        "name": "jumpToQuestion",
+        "type": "text",
+        "label": "Label for jumping to a certain question",
+        "default": "Jump to question %d"
       }
     ]
   },