Changeset 3281 in subversion

Timestamp:

Feb 22, 2010 6:26:25 AM (3 years ago)

Author:

alec

Message:

• Fix email address auto-completion shows regexp pattern (#1486258)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix email address auto-completion shows regexp pattern (#1486258)
 - Fix merging of configuration parameters: user prefs always survive (#1486368) 
 - Fix quota indicator value after folder purge/expunge (#1486488)

trunk/roundcubemail/program/js/app.js

@@ -2807 +2807 @@
   {
     // display search results
-    if (a_results.length && this.ksearch_input) {
-      var p, ul, li;
+    if (a_results.length && this.ksearch_input && this.ksearch_value) {
+      var p, ul, li, s_val = this.ksearch_value;
       
       // create results pane if not present
@@ -2820 +2820 @@
       ul = this.ksearch_pane.__ul;
       ul.innerHTML = '';
-            
+
       // add each result line to list
       for (i=0; i<a_results.length; i++) {
         li = document.createElement('LI');
-        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.innerHTML = a_results[i].replace(new RegExp('('+s_val+')', '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) };