Changeset 5273 in subversion

Timestamp:

Sep 23, 2011 3:48:21 AM (20 months ago)

Author:

alec

Message:

• Fix check if new search value contains old one and previous search was empty in autocomplete

File:

• trunk/roundcubemail/program/js/app.js (modified) (4 diffs)

trunk/roundcubemail/program/js/app.js

@@ -3616 +3616 @@
       p = inp_value.lastIndexOf(',', cpos-1),
       q = inp_value.substring(p+1, cpos),
-      min = this.env.autocomplete_min_length;
+      min = this.env.autocomplete_min_length,
+      ac = this.ksearch_data;
 
     // trim query string
@@ -3642 +3643 @@
       return;
 
-    // ...new search value contains old one and previous search result was empty
-    if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
+    // ...new search value contains old one and previous search was not finished or its result was empty
+    if (old_value && old_value.length && q.indexOf(old_value) == 0 && (!ac || !ac.num) && this.env.contacts && !this.env.contacts.length)
       return;
 
@@ -3651 +3652 @@
       action = props && props.action ? props.action : 'mail/autocomplete';
 
-    this.ksearch_data = {id: reqid, sources: sources.slice(), action: action, locks: [], requests: []};
+    this.ksearch_data = {id: reqid, sources: sources.slice(), action: action,
+      locks: [], requests: [], num: sources.length};
 
     for (i=0; i<threads; i++) {
@@ -3736 +3738 @@
     // run next parallel search
     if (data.id == reqid) {
+      data.num--;
       if (maxlen > 0 && data.sources.length) {
         var lock, xhr, source = data.sources.shift();