Changeset 1519 in subversion

Timestamp:

Jun 12, 2008 10:02:26 AM (5 years ago)

Author:

alec

Message:

• applied r1510, r1508, r1507 changes

Location:

branches/devel-jquery/program/js

Files:

• app.js (modified) (5 diffs)
• list.js (modified) (4 diffs)

branches/devel-jquery/program/js/app.js

@@ -1398 +1398 @@
       this.set_busy(true, 'movingmessage');
       }
-    else
+    else if (!this.env.flag_for_deletion)
       this.show_contentframe(false);
 
@@ -1404 +1404 @@
     this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', false);
 
-    this._with_selected_messages('moveto', lock, add_url);
+    this._with_selected_messages('moveto', lock, add_url, (this.env.flag_for_deletion ? false : true));
     };
 
@@ -1454 +1454 @@
       
     this.show_contentframe(false);
-    this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''));
+    this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''), true);
     };
 
   // Send a specifc request with UIDs of all selected messages
   // @private
-  this._with_selected_messages = function(action, lock, add_url)
+  this._with_selected_messages = function(action, lock, add_url, remove)
     {
     var a_uids = new Array();
@@ -1468 +1468 @@
       {
       var selection = this.message_list.get_selection();
+      var rows = this.message_list.rows;
       var id;
       for (var n=0; n<selection.length; n++)
@@ -1474 +1475 @@
         a_uids[a_uids.length] = id;
 
-        this.message_list.remove_row(id, (n == selection.length-1));
+        if (remove)
+          this.message_list.remove_row(id, (n == selection.length-1));
+        else
+          {
+          rows[id].deleted = true;
+        
+          if (rows[id].classname.indexOf('deleted')<0)
+            {
+            rows[id].classname += ' deleted';
+            this.set_classname(rows[id].obj, 'deleted', true);
+            }
+        
+          if (rows[id].icon && this.env.deletedicon)
+            rows[id].icon.src = this.env.deletedicon;
+          }
         }
       }

branches/devel-jquery/program/js/list.js

@@ -88 +88 @@
     // set body events
     if (this.keyboard)
-      rcube_event.add_listener({element:document, event:'keydown', object:this, method:'key_press'});
+      rcube_event.add_listener({element:document, event:'keypress', object:this, method:'key_press'});
   }
 },
@@ -558 +558 @@
     case 40:
     case 38: 
+        case 63233: // "down", in safari keypress
+        case 63232: // "up", in safari keypress
       return this.use_arrow_key(keyCode, mod_key);
       break;
@@ -577 +579 @@
 {
   var new_row;
-  if (keyCode == 40) // down arrow key pressed
+  // Safari uses the nonstandard keycodes 63232/63233 for up/down, if we're
+  // using the keypress event (but not the keydown or keyup event).
+  if (keyCode == 40 || keyCode == 63233) // down arrow key pressed
     new_row = this.get_next_row();
-  else if (keyCode == 38) // up arrow key pressed
+  else if (keyCode == 38 || keyCode == 63232) // up arrow key pressed
     new_row = this.get_prev_row();
 
@@ -693 +697 @@
   rcube_event.remove_listener({element:document, event:'mouseup', object:this, method:'drag_mouse_up'});
 
+  this.focus();
+
   return rcube_event.cancel(e);
 },