summaryrefslogtreecommitdiff
path: root/roundcubemail/program/js/app.js
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-08 16:59:18 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-08 16:59:18 +0000
commit4e127e85e286c6407afdedc321fd930ef6aa00be (patch)
treeb5b61b0901acde5c7e381679aae666b0f9262006 /roundcubemail/program/js/app.js
parent59e18a2ae8585889445d90675e27bca85b5caa50 (diff)
- Fix message delete button title when flag_for_deletion is enabled
git-svn-id: https://svn.roundcube.net/trunk@4922 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/js/app.js')
-rw-r--r--roundcubemail/program/js/app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 2f9bfbdf9..3143236d2 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -209,7 +209,7 @@ function rcube_webmail()
$(this.gui_objects.qsearchbox).focusin(function() { rcmail.message_list.blur(); });
}
- if (this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox)
+ if (!this.env.flag_for_deletion && this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox)
this.set_alttext('delete', 'movemessagetotrash');
this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward',
@@ -526,7 +526,7 @@ function rcube_webmail()
this.list_mailbox(props);
- if (this.env.trash_mailbox)
+ if (this.env.trash_mailbox && !this.env.flag_for_deletion)
this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage');
}
else if (this.task == 'addressbook') {