show adavanced tools with JavaScript only

dokuwiki · Mar 28, 2018 · 826e222 · 826e222
1 parent a00078f
commit 826e222
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/inc/Ui/Search.php b/inc/Ui/Search.php
@@ -187,11 +187,6 @@ protected function isFragmentAssistanceAvailable(array $parsedQuery) {
      */
     protected function addSearchAssistanceElements(Form $searchForm)
     {
-        global $lang;
-        $searchForm->addButton('toggleAssistant', $lang['search_toggle_tools'])
-            ->attr('type', 'button')
-            ->addClass('toggleAssistant');
-
         $searchForm->addTagOpen('div')
             ->addClass('advancedOptions')
             ->attr('style', 'display: none;')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
@@ -72,7 +72,7 @@
 $lang['searchcreatepage']      = 'If you didn\'t find what you were looking for, you can create or edit the page %s, named after your query.';
 
 $lang['search_fullresults']    = 'Fulltext results';
-$lang['search_toggle_tools']   = 'Toggle search tools';
+$lang['js']['search_toggle_tools']   = 'Toggle Search Tools';
 $lang['search_exact_match']    = 'Exact match';
 $lang['search_starts_with']    = 'Starts with';
 $lang['search_ends_with']      = 'Ends with';

diff --git a/lib/scripts/search.js b/lib/scripts/search.js
@@ -6,26 +6,30 @@ jQuery(function () {
         return;
     }
 
-    const $toggleAssistanceButton = $searchForm.find('button.toggleAssistant');
-    if (!$toggleAssistanceButton.length) {
-        return;
-    }
+    const $toggleAssistanceButton = jQuery('<button>')
+        .addClass('toggleAssistant')
+        .attr('type', 'button')
+        .attr('aria-expanded', 'false')
+        .text(LANG.search_toggle_tools)
+        .prependTo($searchForm.find('fieldset'))
+    ;
 
     $toggleAssistanceButton.on('click', function () {
         jQuery('.advancedOptions').toggle(0, function () {
             var $me = jQuery(this);
             if ($me.attr('aria-hidden')) {
                 $me.removeAttr('aria-hidden');
                 $toggleAssistanceButton.attr('aria-expanded', 'true');
+                DokuCookie.setValue('sa', 'on');
             } else {
                 $me.attr('aria-hidden', 'true');
                 $toggleAssistanceButton.attr('aria-expanded', 'false');
+                DokuCookie.setValue('sa', 'off');
             }
         });
-        DokuCookie.setValue('sa', !DokuCookie.getValue('sa'));
     });
 
-    if (DokuCookie.getValue('sa')) {
+    if (DokuCookie.getValue('sa') === 'on') {
         $toggleAssistanceButton.click();
     }