Darn, I left a 'shiftKey' which should've been a 'shiftkey' (lower case k).


Sorry again.



Robin
Index: program/localization/en_US/messages.inc
===================================================================
--- program/localization/en_US/messages.inc     (revision 368)
+++ program/localization/en_US/messages.inc     (working copy)
@@ -68,6 +68,8 @@
 
 $messages['deletecontactconfirm']  = 'Do you really want to delete the 
selected contact(s)?';
 
+$messages['deletemessagesconfirm'] = 'Do you really want to delete the 
selected message(s)?';
+
 $messages['deletefolderconfirm']  = 'Do you really want to delete this 
folder?';
 
 $messages['purgefolderconfirm']  = 'Do you really want to delete all messages 
in this folder?';
Index: program/js/list.js
===================================================================
--- program/js/list.js  (revision 368)
+++ program/js/list.js  (working copy)
@@ -32,6 +32,8 @@
   this.rows = [];
   this.selection = [];
   
+  this.shiftkey = false;
+
   this.multiselect = false;
   this.draggable = false;
   this.keyboard = false;
@@ -504,6 +506,8 @@
   if (this.focused != true) 
     return true;
 
+  this.shiftkey = e.shiftKey;
+
   var keyCode = document.layers ? e.which : document.all ? event.keyCode : 
document.getElementById ? e.keyCode : 0;
   var mod_key = rcube_event.get_modifier(e);
   switch (keyCode)
Index: program/js/app.js
===================================================================
--- program/js/app.js   (revision 368)
+++ program/js/app.js   (working copy)
@@ -1314,7 +1314,14 @@
 
     // if there is a trash mailbox defined and we're not currently in it:
     if (this.env.trash_mailbox && 
String(this.env.mailbox).toLowerCase()!=String(this.env.trash_mailbox).toLowerCase())
-      this.move_messages(this.env.trash_mailbox);
+      // if shift was pressed delete it immediately
+      if (this.message_list.shiftkey)
+        {
+        if (confirm(this.get_label('deletemessagesconfirm')))
+          this.permanently_remove_messages();
+        }
+      else
+        this.move_messages(this.env.trash_mailbox);
     // if there is a trash mailbox defined but we *are* in it:
     else if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase() 
== String(this.env.trash_mailbox).toLowerCase())
       this.permanently_remove_messages();

Reply via email to