From c920aaad118654f4bacac1a203fc1f3be643d93b Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 31 Mar 2020 09:18:50 +0200
Subject: [PATCH] fix #3533 @0.5

---
 resources/quiz/js/main.js  | 22 +++++++++-------------
 resources/quiz/js/scorm.js |  1 -
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/resources/quiz/js/main.js b/resources/quiz/js/main.js
index 53da1f015..7199d73a1 100644
--- a/resources/quiz/js/main.js
+++ b/resources/quiz/js/main.js
@@ -140,7 +140,7 @@
                     // Set correct tag
                     var correct = $(this).attr('correct') == '1' ? 1 : 0;
                     correctCount += correct;
-                    $(a).find('.answer').data('correct', correct);
+                    $(a).find('.answer').attr('data-correct', correct);
                     $(q).find('.answers').append($(a));
                     an++;
                 });
@@ -192,25 +192,23 @@
                 return false;
             });
 
-            initScreen(state.q - 1);
+
             if (state.a) {
                 $.each($(state.a), function (k, v) {
-                    var q = $('.question').eq(k);
-                    $.each(function (kk, vv) {
-                        $(q).find('.answer').eq(vv).addClass('active');
+                    var q = $('section.question[data-q="' + (k + 1) + '"]');
+                    $.each(v, function (kk, vv) {
+                        $(q).find('.answer[data-a="' + vv + '"]').addClass('active');
                     });
-                    if ($(q).hasClass('multiple')) {
-                        $(q).find('.answer').not('.active').addClass('inactive');
-                    }
                 });
             }
+            initScreen(state.q - 1);
         }
 
         function validateMulti(button) {
             var question = $(button).closest('.question');
             var ok = true;
             $(question).find('.answer').each(function () {
-                if (($(this).data('correct') == '1') != $(this).hasClass('active')) {
+                if (($(this).attr('data-correct') == '1') != $(this).hasClass('active')) {
                     ok = false;
                     return false;
                 }
@@ -230,7 +228,7 @@
                 $(answer).addClass('active');
                 $('section:visible').find('.answer:not(.active)').addClass('inactive');
                 updateScore();
-                displayBadge($(answer).data('correct') == 1);
+                displayBadge($(answer).attr('data-correct') == 1);
                 resizeContainer();
             } else {
                 $(answer).toggleClass('active');
@@ -335,7 +333,7 @@
                 var ok = true;
 
                 $(this).find('.answer').each(function () {
-                    var correct = $(this).data('correct') == '1';
+                    var correct = $(this).attr('data-correct') == '1';
                     var active = $(this).hasClass('active');
                     if (correct !== active) {
                         ok = false;
@@ -359,8 +357,6 @@
                 a: answers
             };
 
-            console.log(state);
-
             if (SCORM) {
                 setSCORMLocation(state);
             }
diff --git a/resources/quiz/js/scorm.js b/resources/quiz/js/scorm.js
index 8cb476e61..31692e92d 100644
--- a/resources/quiz/js/scorm.js
+++ b/resources/quiz/js/scorm.js
@@ -24,7 +24,6 @@ function initScormEvents() {
         } else {
             savedState = JSON.parse(savedState);
         }
-        console.log(savedState);
         $(document).trigger('quizinit', savedState);
     } catch (err) {
         console.error(err);
-- 
2.39.5