summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-06-08 14:18:39 +0200
committerAleksander Machniak <alec@alec.pl>2012-06-08 14:18:39 +0200
commitc281619b96afaa34274bb56a3506e5c59b325b02 (patch)
treea8e66528992fc222a08335e5ab0ec2c885984e1e /program/js
parent6237c947583f96df072b535d9b3c6fd7a79e2921 (diff)
Fix Shift + delete button does not permanently delete messages (#1488243)
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 7eb8c787c..a5c7db441 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -493,7 +493,7 @@ function rcube_webmail()
/*********************************************************/
// execute a specific command on the web client
- this.command = function(command, props, obj)
+ this.command = function(command, props, obj, event)
{
var ret, uid, cid, url, flag;
@@ -713,7 +713,7 @@ function rcube_webmail()
case 'delete':
// mail task
if (this.task == 'mail')
- this.delete_messages();
+ this.delete_messages(event);
// addressbook task
else if (this.task == 'addressbook')
this.delete_contacts();
@@ -2555,7 +2555,7 @@ function rcube_webmail()
};
// delete selected messages from the current mailbox
- this.delete_messages = function()
+ this.delete_messages = function(event)
{
var uid, i, len, trash = this.env.trash_mailbox,
list = this.message_list,
@@ -2587,7 +2587,7 @@ function rcube_webmail()
// if there is a trash mailbox defined and we're not currently in it
else {
// if shift was pressed delete it immediately
- if (list && list.modkey == SHIFT_KEY) {
+ if ((list && list.modkey == SHIFT_KEY) || (event && rcube_event.get_modifier(event) == SHIFT_KEY)) {
if (confirm(this.get_label('deletemessagesconfirm')))
this.permanently_remove_messages();
}