svncommit
2006-11-21 31c171846ec7c387fb7fc3e979a63330420002b0
Bypass Trash folder if Shift-Del was pressed.


4 files modified
16 ■■■■■ changed files
program/js/app.js 9 ●●●● patch | view | raw | blame | history
program/js/list.js 4 ●●●● patch | view | raw | blame | history
program/localization/en_US/messages.inc 2 ●●●●● patch | view | raw | blame | history
program/steps/mail/func.inc 1 ●●●● patch | view | raw | blame | history
program/js/app.js
@@ -1342,7 +1342,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();
program/js/list.js
@@ -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)
program/localization/en_US/messages.inc
@@ -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?';
program/steps/mail/func.inc
@@ -79,6 +79,7 @@
  // add some labels to client
  rcube_add_label('purgefolderconfirm');
  rcube_add_label('deletemessagesconfirm');
  
// $mboxlist_start = rcube_timer();