Merge pull request #170 from splitbrain/dont_hide_searchsuggestions

Don't hide search suggestion during typing & limit suggestions.

2 files changed, 14 insertions, 3 deletions

diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 9989269cf..9769503a7 100644
--- 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;
@@ -57,6 +59,7 @@ function ajax_qsearch(){
 
     print '<strong>'.$lang['quickhits'].'</strong>';
     print '<ul>';
+    $counter = 0;
     foreach($data as $id => $title){
         if (useHeading('navigation')) {
             $name = $title;
@@ -69,6 +72,12 @@ function ajax_qsearch(){
             }
         }
         echo '<li>' . html_wikilink(':'.$id,$name) . '</li>';
+
+        $counter ++;
+        if($counter > $maxnumbersuggestions) {
+            echo '<li>...</li>';
+            break;
+        }
     }
     print '</ul>';
 }
diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js
index c3d0d94fb..0c3609ada 100644
--- a/lib/scripts/qsearch.js
+++ b/lib/scripts/qsearch.js
@@ -35,9 +35,9 @@ var dw_qsearch = {
 
         // attach eventhandler to search field
         do_qsearch = function () {
-            dw_qsearch.clear_results();
             var value = dw_qsearch.$inObj.val();
             if (value === '') {
+                dw_qsearch.clear_results();
                 return;
             }
             jQuery.post(
@@ -57,7 +57,6 @@ var dw_qsearch = {
                     window.clearTimeout(dw_qsearch.timer);
                     dw_qsearch.timer = null;
                 }
-                dw_qsearch.clear_results();
                 dw_qsearch.timer = window.setTimeout(do_qsearch, 500);
             }
         );
@@ -85,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)