From cab4c8a39c62c14d30f0abf3a4cfd328831606df Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 11 Nov 2019 11:37:21 +0100 Subject: [PATCH] Fix invalid Signature button state after escaping Mailvelope mode (#7015) --- CHANGELOG | 1 + program/js/app.js | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f03afe8eb..e220682c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ CHANGELOG Roundcube Webmail - Managesieve: Fix locked UI after opening filter frame (#7007) - Fix PHP warning: "array_merge(): Expected parameter 2 to be an array, null given in sendmail.inc (#7003) - Fix bug where cache keys could exceed length limit specified in db schema (#7004) +- Fix invalid Signature button state after escaping Mailvelope mode (#7015) RELEASE 1.4.0 ------------- diff --git a/program/js/app.js b/program/js/app.js index 2c2dd3dcf..75ad1f12b 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -3811,8 +3811,11 @@ function rcube_webmail() $('#' + ref.env.composebody).show(); $("[name='_pgpmime']").remove(); - // disable commands that operate on the compose body - ref.enable_command('spellcheck', 'insert-sig', 'toggle-editor', 'insert-response', 'save-response', true); + // re-enable commands that operate on the compose body + ref.enable_command('toggle-editor', 'insert-response', 'save-response', true); + ref.enable_command('spellcheck', !!window.googie); + ref.enable_command('insert-sig', !!(ref.env.signatures && ref.env.identity && ref.env.signatures[ref.env.identity])); + ref.triggerEvent('compose-encrypted', { active:false }); } // embed Mailvelope editor container