wip #6927

diff --git a/js/quiz.accessibility.js b/js/quiz.accessibility.js
index ced76ecff0c3933eafa6f830ec68ee7c7554229f..3a420054e6c147a8bd6fffddd789b8b10c5db217 100644 (file)
--- a/js/quiz.accessibility.js
+++ b/js/quiz.accessibility.js
@@ -23,6 +23,9 @@ QuizAccessibility.prototype = {
 
                 if (key === 'ENTER') {
                     let el = $(':focus').find('[aria-keyshortcuts]')
+                    if(!el) {
+                        $(':focus').get(0).click();
+                    }
                     if ($this.quiz.utils.isEnabled(el)) {
                         el.get(0).click((e) => { return false; });
                         return true;

diff --git a/views/screens/question_country.blade.php b/views/screens/question_country.blade.php
index 207e5a172fcb247411dda5004bd97a714d4d94db..388550e3b2e3224970aae96ba9c47d40e607bbef 100644 (file)
--- a/views/screens/question_country.blade.php
+++ b/views/screens/question_country.blade.php
@@ -5,8 +5,8 @@
     <div class="screen question-text question-country">
         <form id="form-{{$position}}">
             <div class="form-group">
-                <label for="toggleDropdown">
-                    <input class="answer-text" tabindex="1" id="toggleDropdown" name="answer"
+                <label for="toggleDropdown" tabindex="1">
+                    <input class="answer-text" id="toggleDropdown" name="answer"
                            placeholder="{{$question['placeholder']?:$__('Choose a country')}}" type="text"/>
                     <svg class="arrow" xmlns="http://www.w3.org/2000/svg" width="18.828" height="10.414"
                          viewBox="0 0 18.828 10.414">