summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-08-06 07:27:30 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-08-06 07:27:30 +0000
commit10671138ad0fca755c34050cc2ec8f3d960953c2 (patch)
treef1f2edae09d81e2e8a8c6a3a7b36c29efc3cca2a
parentf41244e1fcf5c88325971e64094638176b1b8375 (diff)
- Fix unlocking in abort_request() (#1488025)
git-svn-id: https://svn.roundcube.net/trunk@5026 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/js/app.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 66d24f288..e698e3164 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -3611,6 +3611,8 @@ function rcube_webmail()
var old_value = this.ksearch_value;
this.ksearch_value = q;
+ this.ksearch_destroy();
+
// ...string is empty
if (!q.length)
return;
@@ -3619,8 +3621,6 @@ function rcube_webmail()
if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
return;
- this.ksearch_destroy();
-
var i, lock, source, xhr, reqid = new Date().getTime(),
threads = props && props.threads ? props.threads : 1,
sources = props && props.sources ? props.sources : [],
@@ -5659,7 +5659,7 @@ function rcube_webmail()
if (r.request)
r.request.abort();
if (r.lock)
- this.set_busy(r.lock, false);
+ this.set_busy(false, null, r.lock);
};
// handle HTTP response