summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/app.js9
-rw-r--r--program/js/list.js2
3 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1e34dc4b9..832bc4843 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix DEL key problem in search boxes (#1485528)
- Support several e-mail addresses per user from virtuser_file (#1485678)
- Fix drag&drop with scrolling on IE (#1485786)
- Fix adding signature separator in html mode (#1485350)
diff --git a/program/js/app.js b/program/js/app.js
index 7f60de544..42ea5d95d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1158,7 +1158,7 @@ function rcube_webmail()
this.doc_mouse_up = function(e)
{
var model, li;
-
+
if (this.message_list) {
this.message_list.blur();
model = this.env.mailboxes;
@@ -1170,7 +1170,7 @@ function rcube_webmail()
else if (this.ksearch_value) {
this.ksearch_blur();
}
-
+
// handle mouse release when dragging
if (this.drag_active && model && this.env.last_folder_target) {
this.set_classname(this.get_folder_li(this.env.last_folder_target), 'droptarget', false);
@@ -1299,10 +1299,13 @@ function rcube_webmail()
this.click_on_list = function(e)
{
+ if (this.gui_objects.qsearchbox)
+ this.gui_objects.qsearchbox.blur();
+
if (this.message_list)
this.message_list.focus();
else if (this.contact_list)
- this.contact_list.focus();
+ this.contact_list.focus();
var mbox_li;
if (mbox_li = this.get_folder_li())
diff --git a/program/js/list.js b/program/js/list.js
index 7bae7a5f6..7d16080c5 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -824,8 +824,6 @@ drag_mouse_up: function(e)
}
}
- this.focus();
-
return rcube_event.cancel(e);
},