Changeset 2176 in subversion

Timestamp:

Dec 18, 2008 12:56:50 PM (4 years ago)

Author:

thomasb

Message:

Bugfix and improve auto-completion

Location:

trunk/roundcubemail/program

Files:

• js/app.js (modified) (2 diffs)
• steps/mail/autocomplete.inc (modified) (3 diffs)

trunk/roundcubemail/program/js/app.js

@@ -2536 +2536 @@
   {
     // display search results
-    if (c && a_results.length) {
+    if (c && a_results.length && this.ksearch_input) {
       var p, ul, li;
       
@@ -2555 +2555 @@
       for (i=0; i<a_results.length; i++) {
         li = document.createElement('LI');
-        li.innerHTML = a_results[i].replace(/</, '&lt;').replace(/>/, '&gt;').replace(new RegExp('('+this.ksearch_value+')', 'ig'), '<b>$1</b>');
+        li.innerHTML = a_results[i].replace(new RegExp('('+this.ksearch_value+')', 'ig'), '##$1%%').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/##([^%]+)%%/g, '<b>$1</b>');
         li.onmouseover = function(){ ref.ksearch_select(this); };
         li.onmouseup = function(){ ref.ksearch_click(this) };

trunk/roundcubemail/program/steps/mail/autocomplete.inc

@@ -20 +20 @@
 */
 
+$MAXNUM = 15;  // same limit as in app.js
 $contacts = array();
 
@@ -26 +27 @@
   foreach ($RCMAIL->config->get('autocomplete_addressbooks', array('sql')) as $id) {
     $abook = $RCMAIL->get_address_book($id);
-    $abook->set_pagesize(20);
+    $abook->set_pagesize($MAXNUM);
 
     if ($result = $abook->search(array('email','name'), $search)) {
@@ -35 +36 @@
       }
     }
+    
+    if (count($contacts) >= $MAXNUM)
+      break;
   }