use var and remove suggestions when needed

Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
dokuwiki · Feb 3, 2013 · 4860686 · 4860686
1 parent d91a4ef
commit 4860686
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
@@ -45,6 +45,8 @@ function ajax_qsearch(){
     global $lang;
     global $INPUT;
 
+    $maxnumbersuggestions = 50;
+
     $query = $INPUT->post->str('q');
     if(empty($query)) $query = $INPUT->get->str('q');
     if(empty($query)) return;
@@ -72,7 +74,7 @@ function ajax_qsearch(){
         echo '<li>' . html_wikilink(':'.$id,$name) . '</li>';
 
         $counter ++;
-        if($counter > 50) {
+        if($counter > $maxnumbersuggestions) {
             echo '<li>...</li>';
             break;
         }

diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js
@@ -37,6 +37,7 @@ var dw_qsearch = {
         do_qsearch = function () {
             var value = dw_qsearch.$inObj.val();
             if (value === '') {
+                dw_qsearch.clear_results();
                 return;
             }
             jQuery.post(
@@ -83,7 +84,10 @@ var dw_qsearch = {
     onCompletion: function(data) {
         var max, $links, too_big;
 
-        if (data === '') { return; }
+        if (data === '') {
+            dw_qsearch.clear_results();
+            return;
+        }
 
         dw_qsearch.$outObj
             .html(data)