From 844ec53612984d37aa99903e7aa340a2bf7f942c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 18 Mar 2019 13:55:04 +0100
Subject: [PATCH] Elastic: Fix bug where toolbar disappears on attachment menu
 use in Chrome (#6677)

---
 CHANGELOG           | 1 +
 skins/elastic/ui.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index aaee5e140..2f219025d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ CHANGELOG Roundcube Webmail
 - Elastic: Changed read/unread icons (#6636)
 - Elastic: Changed "Move to..." icon (#6637)
 - Elastic: Add hide/show for advanced preferences (#6632)
+- Elastic: Fix bug where toolbar disappears on attachment menu use in Chrome (#6677)
 - Fix so "Open in new window" consistently displays "external window" interface (#6659)
 - Fix bug where next row wasn't selected after deleting a collapsed thread (#6655)
 - Fix bug where external content (e.g. mail body) was passed to templates parsing code (#6640)
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 664e044af..f7cc6a690 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -2847,7 +2847,7 @@ function rcube_elastic_ui()
         });
 
         // call menu-open so core can set state of menu commands
-        rcmail.command('menu-open', {menu: 'attachmentmenu', id: id}, obj, event);
+        return rcmail.command('menu-open', {menu: 'attachmentmenu', id: id}, obj, event);
     };
 
     /**
@@ -2867,7 +2867,7 @@ function rcube_elastic_ui()
                     'class': 'button icon dropdown skip-content'
                 })
                 .on('click', function(e) {
-                    attachmentmenu($('#attachmentmenu'), button, e);
+                    return attachmentmenu($('#attachmentmenu'), button, e);
                 })
                 .append($('<span>').attr('class', 'inner').text(label))
                 .appendTo(item);