Merge pull request #1354 from NatLibFi/issue1345-fix-global-search

Fix header bar search form
NatLibFi · Sep 13, 2022 · 63ebd6e · 63ebd6e
2 parents 17162a2 + e8715d1
commit 63ebd6e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/resource/js/docready.js b/resource/js/docready.js
@@ -580,7 +580,7 @@ $(function() { // DOCUMENT READY
     createCookie('SKOSMOS_SEARCH_LANG', qlang, 365);
   }
 
-  $('.lang-button').on('click', function() {
+  $('a.dropdown-item').on('click', function() {
     qlang = $(this)[0].attributes.hreflang ? $(this)[0].attributes.hreflang.value : 'anything';
     $('#lang-dropdown-toggle').html($(this).html() + ' <span class="caret"></span>');
     $('#lang-input').val(qlang);
@@ -942,7 +942,7 @@ $(function() { // DOCUMENT READY
   // activating the custom autocomplete
   function updateVocabParam() {
     vocabSelectionString = '';
-    var $vocabs = $('li > a.active input');
+    var $vocabs = $('button.active input');
     $.each($vocabs,
       function(index, ob) {
         if (ob.value === 'multiselect-all') {
@@ -1008,6 +1008,10 @@ $(function() { // DOCUMENT READY
       }
       updateVocabParam();
     },
+    onSelectAll: function() {
+      selectedVocabs = [];
+      updateVocabParam();
+    },
     maxHeight: 300
   });
 

diff --git a/resource/js/scripts.js b/resource/js/scripts.js
@@ -16,7 +16,7 @@ function createCookie(name,value,days) {
     date.setTime(date.getTime() + (days*24*60*60*1000));
     expires = "; expires=" + date.toGMTString();
   }
-  document.cookie = name + "=" + value + expires + "; path=/";
+  document.cookie = name + "=" + value + expires + "; path=/; SameSite=Lax";
 }
 
 function readCookie(name) {

diff --git a/view/headerbar.twig b/view/headerbar.twig
@@ -36,8 +36,8 @@
               ?clang={{langcode}}
               {%- set paramSeparator = '&' -%}
             {%- endif %}
-            {%- if term %}{{ paramSeparator }}q={{ term }}{% set paramSeparor = '&' %}{% endif -%}
-            {%- if vocabs %}{{ paramSepartor }}vocabs={{ vocabs }}{% endif -%}
+            {%- if term %}{{ paramSeparator }}q={{ term }}{% set paramSeparator = '&' %}{% endif -%}
+            {%- if vocabs %}{{ paramSeparator }}vocabs={{ vocabs }}{% endif -%}
             " class="lang-button" hreflang="{{ langcode }}">{{ langcode | lang_name(request.lang) }}</a></li>
           {% endfor %}
         {% endif %}