DIE MICROSOFT DIE IE9 STILL EATING SHIFT AND CTRL

[citadel.git] / webcit / static / summaryview.js

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 6b2f0ee05ab8586947dbbbf9e56eee3d7bcfdb64..407c2af9db980f89d2b0f735ad0ad6ed90d3ec12 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -269,8 +269,12 @@ function CtdlMessageListClick(evt) {
        var target = event.target ? event.target: event.srcElement; // and again..
        var parent = target.parentNode;
        var msgId = parent.getAttribute("citadel:msgid");
+       var is_shift_pressed = 0;
+       var is_ctrl_pressed = 0;
        // If the ctrl key modifier wasn't used, unmark all rows and load the message
-       if (!event.shiftKey && !event.ctrlKey && !event.altKey) {
+       is_shift_pressed = event.shiftKey;
+       is_ctrl_pressed = event.ctrlKey;
+       if (!is_shift_pressed && !is_ctrl_pressed) {
                previousFinish = 0;
                markedFrom = 0;
                unmarkAllRows();
@@ -286,7 +290,7 @@ function CtdlMessageListClick(evt) {
                        onComplete: CtdlMarkRowAsRead(parent)
                });
                // If the shift key modifier is used, mark a range...
-       } else if (event.button != 2 && event.shiftKey) {
+       } else if (event.button != 2 && is_shift_pressed) {
                if (originalMarkedRow == null) {
                        originalMarkedRow = parent;
                        markRow(parent);
@@ -315,7 +319,7 @@ function CtdlMessageListClick(evt) {
                        markRow(parent.parentNode.rows[x]);
                }
                // If the ctrl key modifier is used, toggle one message
-       } else if (event.button != 2 && (event.ctrlKey || event.altKey)) {
+       } else if (event.button != 2 && is_ctrl_pressed) {
                if (parent.getAttribute("citadel:marked")) {
                        unmarkRow(parent);
                }
@@ -408,31 +412,53 @@ function deleteAllMarkedRows() {
        msgs = newMsgs;
        resortAndDisplay(null);
 }
-
 function deleteAllSelectedMessages() {
-       var pa = "";
-       for(msgId in currentlyMarkedRows) {
-               if (!room_is_trash) {
-                       pa = encodeURI("g_cmd=MOVE " + msgId + "|_TRASH_|0");
-               }
-               else {
-                       pa = encodeURI("g_cmd=DELE " + msgId);
+    var mvCommand = "";
+    var msgIds = "";
+    for(msgId in currentlyMarkedRows) {
+       msgIds += ","+msgId;
+
+       if (msgIds.length > 800) {
+           if (!room_is_trash) {
+               mvCommand = encodeURI("g_cmd=MOVE " + msgIds + "|_TRASH_|0");
+           }
+           else {
+               mvCommand = encodeURI("g_cmd=DELE " + msgIds);
+           }
+           new Ajax.Request("ajax_servcmd", {
+               parameters: mvCommand,
+               method: 'post',
+               onSuccess: function(transport) {
+                   WCLog(transport.responseText);
                }
-               new Ajax.Request("ajax_servcmd", {
-                       parameters: pa,
-                       method: 'post',
-                       onSuccess: function(transport) {
-                               WCLog(transport.responseText);
-                       }
-               });
+           });
+           msgIds = "";
+       }
+    }
+
+    if (!room_is_trash) {
+       mvCommand = encodeURI("g_cmd=MOVE " + msgIds + "|_TRASH_|0");
+    }
+    else {
+       mvCommand = encodeURI("g_cmd=DELE " + msgIds);
+    }
+    new Ajax.Request("ajax_servcmd", {
+       parameters: mvCommand,
+       method: 'post',
+       onSuccess: function(transport) {
+           WCLog(transport.responseText);
        }
-       document.getElementById("preview_pane").innerHTML = "";
-       deleteAllMarkedRows();
+    });
+
+    document.getElementById("preview_pane").innerHTML = "";
+    deleteAllMarkedRows();
 }
 
+
 function CtdlMessageListKeyUp(event) {
-       var key = event.which;
-       if (key == 46) { // DELETE
+       var key = event.which || event.keyCode;
+
+       if (key == 46) {                                /* DELETE */
                deleteAllSelectedMessages();
        }
 }