summaryrefslogtreecommitdiff
path: root/skins
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-04-25 18:13:32 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-04-25 18:13:32 +0200
commit8dc87e62fbc13246d6f95219b4d9253f4fa9d385 (patch)
tree3835ea38cf48e563c74a8dacf91695fed30bfd7f /skins
parenta54cff4c569f74f7ec1b2ab8379b7ad1820a8af9 (diff)
Avoid popupmenus being closed when scrollbar is clicked (#1489832)
Diffstat (limited to 'skins')
-rw-r--r--skins/classic/functions.js1
-rw-r--r--skins/larry/ui.js1
2 files changed, 2 insertions, 0 deletions
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index 7445dba80..39dd96e3b 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -416,6 +416,7 @@ body_mouseup: function(evt, p)
for (i in this.popups) {
if (this.popups[i].obj.is(':visible') && target != rcube_find_object(i+'link')
&& !this.popups[i].toggle
+ && target != this.popups[i].obj.get(0) // check if scroll bar was clicked (#1489832)
&& (!this.popups[i].editable || !this.target_overlaps(target, this.popups[i].id))
&& (!this.popups[i].sticky || !rcube_mouse_is_over(evt, rcube_find_object(this.popups[i].id)))
&& !$(target).is('.folder-selector-link') && !$(target).children('.folder-selector-link').length
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 6fb05212d..1cd75acaf 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -380,6 +380,7 @@ function rcube_mail_ui()
config = popupconfig[id];
if (obj.is(':visible')
&& target.id != id+'link'
+ && target != obj.get(0) // check if scroll bar was clicked (#1489832)
&& !config.toggle
&& (!config.editable || !target_overlaps(target, obj.get(0)))
&& (!config.sticky || !rcube_mouse_is_over(e, obj.get(0)))