deleteAllSelectedMessages(): don't send one request per message, citadel can handle...

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

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 6fd338c770eb17aa75f80ed840d161a2e839b2f2..280fe788551363d9a7153b1d8667a526be1b4f35 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -279,10 +279,12 @@ function CtdlMessageListClick(evt) {
                document.getElementById("preview_pane").innerHTML = "";
                new Ajax.Updater('preview_pane', 'msg/'+msgId, {method: 'get'});
                markRow(parent);
+               var p = encodeURI('g_cmd=SEEN ' + msgId + '|1');
                new Ajax.Request('ajax_servcmd', {
                        method: 'post',
-                                       parameters: 'g_cmd=SEEN ' + msgId + '|1',
-                                       onComplete: CtdlMarkRowAsRead(parent)});
+                       parameters: p,
+                       onComplete: CtdlMarkRowAsRead(parent)
+               });
                // If the shift key modifier is used, mark a range...
        } else if (event.button != 2 && event.shiftKey) {
                if (originalMarkedRow == null) {
@@ -362,10 +364,10 @@ function getSortMode(toggleElem) {
 function removeOldSortClass() {
        if (currentSorterToggle) {
                var classes = currentSorterToggle.className;
-               /* classes = classes.replace("current_sort_mode","");
-                  classes = classes.replace("sort_ascending","");
-                  classes = classes.replace("sort_descending",""); */
-               currentSorterToggle.className = "";
+               classes = classes.replace("current_sort_mode","");
+               classes = classes.replace("sort_ascending","");
+               classes = classes.replace("sort_descending","");
+               currentSorterToggle.className = classes;
        }
 }
 function markRow(row) {
@@ -406,21 +408,29 @@ function deleteAllMarkedRows() {
        msgs = newMsgs;
        resortAndDisplay(null);
 }
-
 function deleteAllSelectedMessages() {
-       for(msgId in currentlyMarkedRows) {
-               if (!room_is_trash) {
-                       new Ajax.Request('ajax_servcmd', 
-                                        {method: 'post',
-                                                        parameters: 'g_cmd=MOVE ' + msgId + '|_TRASH_|0'
-                                                        });
-               } else {
-                       new Ajax.Request('ajax_servcmd', {method: 'post',
-                                               parameters: 'g_cmd=DELE '+msgId});
-               }
+    var mvCommand = "";
+    var msgIds = "";
+    for(msgId in currentlyMarkedRows) {
+       msgIds += ","+msgId;
+    }
+
+    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) {
@@ -476,7 +486,7 @@ function sizePreviewPane() {
        var heightOfViewPort = document.viewport.getHeight() // prototypejs method
                var bannerHeight = banner.offsetHeight;
        var contentViewPortHeight = heightOfViewPort-banner.offsetHeight-message_list_hdr.offsetHeight;
-       contentViewPortHeight = 0.98 * contentViewPortHeight; // leave some error
+       contentViewPortHeight = 0.95 * contentViewPortHeight; // leave some error (especially for FF3!!)
        // Set summary_view to 20%;
        var summary_height = ctdlLocalPrefs.readPref("svheight");
        if (summary_height == null) {