[Svn] r2318 - in trunk/roundcubemail: . program/js program/steps/mail

trac at roundcube.net trac at roundcube.net
Fri Feb 27 12:06:30 CET 2009


Author: thomasb
Date: 2009-02-27 05:06:29 -0600 (Fri, 27 Feb 2009)
New Revision: 2318

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/js/app.js
   trunk/roundcubemail/program/steps/mail/autocomplete.inc
Log:
Prevent concurrent autocomplete query results display (#1485743)

Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2009-02-27 10:56:45 UTC (rev 2317)
+++ trunk/roundcubemail/CHANGELOG	2009-02-27 11:06:29 UTC (rev 2318)
@@ -5,6 +5,7 @@
 ----------
 - Fix mime-type detection using a hard-coded map (#1485311)
 - Don't return empty string if charset conversion failed (#1485757)
+- Disable concurrent autocomplete query results display (#1485743)
 
 2009/02/26 (alec)
 ----------

Modified: trunk/roundcubemail/program/js/app.js
===================================================================
--- trunk/roundcubemail/program/js/app.js	2009-02-27 10:56:45 UTC (rev 2317)
+++ trunk/roundcubemail/program/js/app.js	2009-02-27 11:06:29 UTC (rev 2318)
@@ -2516,8 +2516,12 @@
     this.http_post('autocomplete', '_search='+q);
   };
 
-  this.ksearch_query_results = function(results)
+  this.ksearch_query_results = function(results, search)
   {
+    // ignore this outdated search response
+    if (search != this.ksearch_value)
+      return;
+      
     this.hide_message();
     this.env.contacts = results ? results : [];
 

Modified: trunk/roundcubemail/program/steps/mail/autocomplete.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/autocomplete.inc	2009-02-27 10:56:45 UTC (rev 2317)
+++ trunk/roundcubemail/program/steps/mail/autocomplete.inc	2009-02-27 11:06:29 UTC (rev 2318)
@@ -44,7 +44,7 @@
   sort($contacts);
 }
 
-$OUTPUT->command('ksearch_query_results', $contacts);
+$OUTPUT->command('ksearch_query_results', $contacts, $search);
 $OUTPUT->send();
 
 ?>
\ No newline at end of file

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list