From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 2 Nov 2020 15:04:33 +0000 (+0100)
Subject: wait #4030 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=160c7122356cb985d552450653dfaa2324501c96;p=fluidbook-toolbox.git

wait #4030 @0.25
---

diff --git a/resources/quiz/js/main.js b/resources/quiz/js/main.js
index e3aa5d9d1..fbc228d2e 100644
--- a/resources/quiz/js/main.js
+++ b/resources/quiz/js/main.js
@@ -233,9 +233,8 @@
                 }
             }
             updateScore();
-            if ($(question).attr('data-count') == '0') {
-                ok = null;
-            } else {
+            var ok = null;
+            if ($(question).attr('data-count') == '1') {
                 ok = questionStatus[$(question).data('q')]
             }
 
@@ -278,7 +277,7 @@
 
             if ($(next).is("#resultsscreen")) {
                 var show = showReview === 'always' || (showReview === 'passed' && checkScore());
-                if (show) {
+                if (!show) {
                     $('#correction').hide();
                 } else {
                     $('#correction').show();
@@ -421,10 +420,19 @@
                     log.answer = $(this).find('input').val();
                 }
 
+                if (!count) {
+                    ok = null;
+                }
+
                 questionStatus[qn] = ok;
 
                 var b = $("#correction .correction[data-i='" + qn + "'] .badge");
-                $(b).removeClass('correct').removeClass('incorrect').addClass(ok ? 'correct' : 'incorrect');
+                $(b).removeClass('correct').removeClass('incorrect');
+                if (ok === true) {
+                    $(b).addClass('correct');
+                } else if (ok === false) {
+                    $(b).addClass('incorrect');
+                }
                 if (ok && count) {
                     score++;
                     log.score = 1;