Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-06 16:16:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistent fowarding actions statuses on drafts (#8039)

Browse Source
This commit is contained in:
Aleksander Machniak
2021-05-08 09:29:34 +02:00
parent 0b9346be01
commit 445a8468e0
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -34,6 +34,7 @@ CHANGELOG Roundcube Webmail
- Fix HTML5 parser issue with a messy HTML code from Outlook (#7356)
- Fix handling of multiple link references with the same index in plain text message (#8021)
- Fix various actions on folders with angle brackets in name (#8037)
- Fix inconsistent fowarding actions statuses on drafts (#8039)
RELEASE 1.5-beta
----------------

33
program/js/app.js
View File

@@ -1938,16 +1938,34 @@ function rcube_webmail()
if (this.preview_timer)
clearTimeout(this.preview_timer);
var selected = list.get_single_selection(),
selected_count = list.get_selection(false).length;
var isDraft = false,
selected = list.get_single_selection(),
selection = list.get_selection(false),
selected_count = selection.length;
this.enable_command(this.env.message_commands, selected != null);
// Find out whether any of the selected messages comes from the Drafts folder
if (selected_count > 0) {
if (!this.env.multifolder_listing) {
isDraft = this.env.mailbox == this.env.drafts_mailbox
}
else {
$.each(selection, function(i, v) {
if (ref.get_message_mailbox(v) == ref.env.drafts_mailbox) {
isDraft = true;
return false;
}
});
}
}
// Disable some actions enabled above
if (selected) {
// Hide certain command buttons when Drafts folder is selected
if (this.get_message_mailbox(selected) == this.env.drafts_mailbox)
this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-attachment', 'forward-inline', false);
// Disable reply-list when List-Post header is not set
if (isDraft) {
this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-inline',
'forward-attachment', 'bounce', false);
}
else {
var msg = this.env.messages[selected];
if (!msg.ml)
@@ -1956,7 +1974,8 @@ function rcube_webmail()
}
// Multi-message commands
this.enable_command('delete', 'move', 'copy', 'mark', 'forward', 'forward-attachment', selected_count > 0);
this.enable_command('delete', 'move', 'copy', 'mark', selected_count > 0);
this.enable_command('forward', 'forward-attachment', !isDraft && selected_count > 0);
// reset all-pages-selection
if (selected || (selected_count && selected_count != list.rowcount))