wait #6690 @0:15

diff --git a/js/quiz.screen.outro.js b/js/quiz.screen.outro.js
index 299811562708f3139eae9822dbb6459dc4a55b34..4c53bd27a42b5f74ee2cf8fafb31caa80f2d942e 100644 (file)
--- a/js/quiz.screen.outro.js
+++ b/js/quiz.screen.outro.js
@@ -201,8 +201,9 @@ QuizScreenOutro.prototype = {
         }
     },
 
-    returnContentClass: function(str = "") {
-        return str.length >= 83 ? "content" : ""
+    returnContentClass: function(str = "", type = "") {
+        let maxLength = type === "multiple" ? 200 : type === "draganddrop" ? 75 : 85
+        return str.length >= maxLength ? "content" : ""
     },
 
     displayReviewList: function () {
@@ -282,7 +283,7 @@ QuizScreenOutro.prototype = {
                             nokClass = "nok"
                         }
                         html += '<div class="card-holder multiple-item slot ' + nokClass +'" data-tooltip="'+correctAnswers[j].answer+'">';
-                        html += '<p class="answer ' + this.returnContentClass(correctAnswers[j].answer)+'">' + correctAnswers[j].answer +'</p>';
+                        html += '<p class="answer ' + this.returnContentClass(correctAnswers[j].answer,"multiple")+'">' + correctAnswers[j].answer +'</p>';
                         html += htmlSpan;
                         html += '</div>';
                     }
@@ -299,25 +300,30 @@ QuizScreenOutro.prototype = {
                 html += '</div>'
                 html += '<div class="area-container">'
 
-                for (let i = 1; i < 3; i++) {
-                    let area = i === 1 ? review.data.area_1 : review.data.area_2
-                    html += '<div class="area area ' + i + '">'
-                    html += '<ul class="area-list card-holder">'
-                    if(correctAnswers.length > 0) {
-                        for (let k in correctAnswers) {
-                            if (correctAnswers[k].drop_area === i) {
-                                htmlSpan = ""
-                                if (correctAnswers[k].status === "nok") {
-                                    htmlSpan = `<span class="access nok">${wrongIcon}</span>`
+                if(correctAnswers.filter( (n) => { return n['drop_area'] !== undefined } ).length === correctAnswers.length) {
+
+                    for (let i = 1; i < 3; i++) {
+                        let area = i === 1 ? review.data.area_1 : review.data.area_2
+                        html += '<div class="area area ' + i + '">'
+                        html += '<ul class="area-list card-holder">'
+                        if (correctAnswers.length > 0) {
+                            for (let k in correctAnswers) {
+                                if (correctAnswers[k].drop_area === i) {
+                                    htmlSpan = ""
+                                    if (correctAnswers[k].status === "nok") {
+                                        htmlSpan = `<span class="access nok">${wrongIcon}</span>`
+                                    }
+                                    html += '<li class="area-item slot active ' + correctAnswers[k].status + '"><p class="' + this.returnContentClass(correctAnswers[k].answer, "draganddrop") + '">' + correctAnswers[k].answer + '</p>'
+                                    html += htmlSpan
+                                    html += '</li>'
                                 }
-                                html += '<li class="area-item slot active ' + correctAnswers[k].status + '" data-tooltip="'+correctAnswers[k].answer+'"><p class="'+this.returnContentClass(correctAnswers[k].answer)+'">' + correctAnswers[k].answer + '</p>'
-                                html += htmlSpan
-                                html += '</li>'
                             }
                         }
+                        html += '</ul>'
+                        html += '</div>'
                     }
-                    html += '</ul>'
-                    html += '</div>'
+                } else {
+                    html += '<p class="timeout">'+this.quiz.l10n.__("Failed because you didn't answer in time")+'</p>'
                 }
                 html += '</div>'
             }

diff --git a/js/quiz.screens.js b/js/quiz.screens.js
index 72a540259e0d182d42ce6000aef9290d9192b9cf..53e2b8bde72aa90958fe14e8005dc6c788c47456 100644 (file)
--- a/js/quiz.screens.js
+++ b/js/quiz.screens.js
@@ -61,7 +61,8 @@ QuizScreens.prototype = {
                 return false;
             }
 
-            if($this.getActiveScreenType() === 'draganddrop' && $this.activeScreen.find(".list-item").length > 0) {
+            if(($this.getActiveScreenType() === 'draganddrop' && $this.activeScreen.find(".list-item").length > 0)
+                && (parseInt($this.quiz.question.current().countdown_enable) && $this.intervalCountDown !== 0)) {
                 return false;
             }
 

diff --git a/style/105-outro.sass b/style/105-outro.sass
index f4dae42da779eb2d012c1ff7958db39454a2c163..5a68723a99c782d8dac5035d2a531dbd5f15f32a 100644 (file)
--- a/style/105-outro.sass
+++ b/style/105-outro.sass
@@ -322,7 +322,7 @@
             border-radius: 8px
             min-height: 52px
         .slot
-            +flex-config(space-between)
+            +flex-config(space-between,false,false,center)
             background-color: rgba($texts-color,.08) !important
 
     .match-title,