summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-07-08 16:59:18 +0000
committeralecpl <alec@alec.pl>2011-07-08 16:59:18 +0000
commit7f554cfaecb52dbbc21c0c905bbc9e181db20b60 (patch)
tree7ac8d13e038d07bb1501d780996f466ef017fa50 /program/js
parentca8a178cc53a7b086c8c1c509105d4e8f88e4f5d (diff)
- Fix message delete button title when flag_for_deletion is enabled
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 2f9bfbdf9..3143236d2 100644
--- a/program/js/app.js
+++ b/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') {