From aaffbeb04936c0e5d96b8cffa8fe4c14e942a633 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 27 Feb 2009 11:06:29 +0000
Subject: Prevent concurrent autocomplete query results display (#1485743)

---
 CHANGELOG                           | 1 +
 program/js/app.js                   | 6 +++++-
 program/steps/mail/autocomplete.inc | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ed66d6a32..946b25ea3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG RoundCube Webmail
 ----------
 - 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)
 ----------
diff --git a/program/js/app.js b/program/js/app.js
index f79905743..7f1e7241b 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2516,8 +2516,12 @@ function rcube_webmail()
     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 : [];
 
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index c840e9cf9..26acc88c2 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -44,7 +44,7 @@ if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_POST)) {
   sort($contacts);
 }
 
-$OUTPUT->command('ksearch_query_results', $contacts);
+$OUTPUT->command('ksearch_query_results', $contacts, $search);
 $OUTPUT->send();
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.3