From 93519df826a3edd9680e3ea549fd10727819e11a Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 18 Jan 2020 10:17:15 +0100 Subject: [PATCH] Elastic: Fix disappearing sidebar in mail compose after clicking Mail button Elastic: Fix incorrect aria-disabled attribute on Mail taskmenu button in mail compose --- CHANGELOG | 2 ++ skins/elastic/ui.js | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 755b16936..4e720153c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,8 @@ CHANGELOG Roundcube Webmail - Enigma: Fix generation of key pairs for identities with IDN domains (#7181) - Enigma: Display IDN domains of key users and identities in UTF8 - Password: Make chpass-wrapper.py Python 3 compatible (#7135) +- Elastic: Fix disappearing sidebar in mail compose after clicking Mail button +- Elastic: Fix incorrect aria-disabled attribute on Mail taskmenu button in mail compose - Elastic: Fix bug where it was possible to switch editor mode when 'htmleditor' was in 'dont_override' (#7143) - Elastic: Fix text selection in recipient inputs (#7129) - Elastic: Fix missing Close button in "more recipients" dialog diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js index 997a2af88..13f205025 100644 --- a/skins/elastic/ui.js +++ b/skins/elastic/ui.js @@ -707,7 +707,10 @@ function rcube_elastic_ui() // In compose/preview window we do not provide "Back" button, instead // we modify the "Mail" button in the task menu to act like it (i.e. calls 'list' command) if (!rcmail.env.extwin && (rcmail.env.action == 'compose' || rcmail.env.action == 'show')) { - $('a.mail', layout.menu).attr('onclick', "return rcmail.command('list','',this,event)"); + $('a.mail', layout.menu).attr({ + 'aria-disabled': false, + onclick: "return rcmail.command('list','',this,event);" + }); } // Append contact menu to all mailto: links @@ -1176,6 +1179,10 @@ function rcube_elastic_ui() */ function content_frame_init() { + if (!layout.list.length) { + return; + } + var last_selected = env.last_selected, title_reset = function(title) { if (typeof title !== 'string' || !title.length) {