wip #6182 @1:00 question match

diff --git a/js/quiz.match.js b/js/quiz.match.js
index f69f0325990d49069f449ca2549045ce518ea9d8..300d9641645f154ba4fedaeeaf2c2ff6db9518e1 100644 (file)
--- a/js/quiz.match.js
+++ b/js/quiz.match.js
@@ -105,14 +105,14 @@ QuizMatch.prototype = {
         this.quiz.screens.currentQuestionAnswers.push(answer)
 
         if(this.swiperTop.activeIndex === lastIndex) {
-            this.validateButton()
+            this.switchMatchValidateButton()
             return false
         }
 
         this.swiperTop.slideNext()
     },
 
-    validateButton: function() {
+    switchMatchValidateButton: function() {
         let btn = $(".active-screen").find(".confirmMatch"),
             text = this.quiz.l10n.__('Validate answer');
 

diff --git a/views/screens/arrow.blade.php b/views/screens/arrow.blade.php
index a4ba78c9b9b0d5829b67ce00ac0761a063502e72..5a50208017e8fa4a361ae92a718aa7e1005c9f51 100644 (file)
--- a/views/screens/arrow.blade.php
+++ b/views/screens/arrow.blade.php
@@ -8,7 +8,7 @@
     }
 @endphp
 
-<div class="controls {{$side}} move-card" aria-keyshortcuts="{{$key}}">
+<div class="controls {{$side}} {{$action}}" aria-keyshortcuts="{{$key}}">
     <p>{{$text}}</p>
     <div class="access">
         <span data-icon="arrow"></span>

diff --git a/views/screens/question_draganddrop.blade.php b/views/screens/question_draganddrop.blade.php
index 3f2db1d931186870e2819997aea98d56cb6fdb5d..231272f6510ad508a11e1d63ae4e34c27e2ef762 100644 (file)
--- a/views/screens/question_draganddrop.blade.php
+++ b/views/screens/question_draganddrop.blade.php
@@ -3,7 +3,7 @@
     @include('header_question', ['question' => $question, 'data' => $data, 'max' => $max, 'position' => $position])
     <div class="vertical-center-screen-relative">
         <div class="screen question-draganddrop">
-            @include('screens.arrow',['side'=>'left'])
+            @include('screens.arrow',['side'=>'left','action'=>'move-card'])
             <ul class="list">
                 @foreach($question['answers'] as $key => $answer)
                     <li class="list-item {{ $key === 0 ? 'current' : '' }}" data-id="{{$key}}">
@@ -13,7 +13,7 @@
                 @endforeach
                 <li class="overlay"></li>
             </ul>
-            @include('screens.arrow',['side'=>'right'])
+            @include('screens.arrow',['side'=>'right','action'=>'move-card'])
         </div>
     </div>
     @include('screens.question_draganddrop_area',['area'=>2,'question'=>$question,'theme'=>$theme])

diff --git a/views/screens/question_match.blade.php b/views/screens/question_match.blade.php
index 6fa3b0ec4a55db6460216fb9244383dd76208b0a..09455aa5d8c249c94344afd7e47665d52a794e5a 100644 (file)
--- a/views/screens/question_match.blade.php
+++ b/views/screens/question_match.blade.php
@@ -9,7 +9,7 @@
     <div class="screen">
 
         <div class="top-slider-container">
-            @include('screens.arrow',['side'=>'left'])
+            @include('screens.arrow',['side'=>'left','action'=>'move-slide'])
             <div class="swiper-container top-slider">
                 <div class="swiper-pagination-top"></div>
                 <div class="swiper-wrapper">
@@ -20,7 +20,7 @@
                     @endforeach
                 </div>
             </div>
-            @include('screens.arrow',['side'=>'right'])
+            @include('screens.arrow',['side'=>'right','action'=>'move-slide'])
         </div>
 
         <div class="swiper-container bottom-slider">