From 72d8403cb6a0e3b31f0154ce3d912d4d5b94aeab Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Wed, 15 Apr 2020 13:37:58 +0200 Subject: [PATCH] Quarantine: set mailinfo visible only on html preview We did already hide it when toggling raw/html, but when choosing raw and changing the mail, it was again set to visible. This patch fixes that by always taking 'me.raw' into account. Signed-off-by: Dominik Csapak --- js/AttachmentQuarantine.js | 2 +- js/SpamQuarantine.js | 2 +- js/VirusQuarantine.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/AttachmentQuarantine.js b/js/AttachmentQuarantine.js index 56de22a..c69c6ae 100644 --- a/js/AttachmentQuarantine.js +++ b/js/AttachmentQuarantine.js @@ -79,7 +79,7 @@ Ext.define('PMG.AttachmentQuarantine', { me.updatePreview(me.raw || false, rec); me.lookup('attachmentlist').setID(rec); - mailinfo.setVisible(!!rec.data); + mailinfo.setVisible(!!rec.data && !me.raw); mailinfo.update(rec.data); }, diff --git a/js/SpamQuarantine.js b/js/SpamQuarantine.js index d2c3a67..60fbae8 100644 --- a/js/SpamQuarantine.js +++ b/js/SpamQuarantine.js @@ -163,7 +163,7 @@ Ext.define('PMG.SpamQuarantine', { me.getViewModel().set('mailid', rec.data ? rec.data.id : ''); me.updatePreview(me.raw || false, rec); me.lookupReference('spaminfo').setID(rec); - me.lookupReference('mailinfo').setVisible(!!rec.data); + me.lookupReference('mailinfo').setVisible(!!rec.data && !me.raw); me.lookupReference('mailinfo').update(rec.data); }, diff --git a/js/VirusQuarantine.js b/js/VirusQuarantine.js index fb1d836..fd72396 100644 --- a/js/VirusQuarantine.js +++ b/js/VirusQuarantine.js @@ -82,7 +82,7 @@ Ext.define('PMG.VirusQuarantine', { mailinfo.setVisible(false); return; } - mailinfo.setVisible(true); + mailinfo.setVisible(!me.raw); mailinfo.update(selection[0].data); },