* Fix subject/from descending sort regression

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

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 930679de9368acced0765c84332bada8d0784cd9..fd7b4f1abfd6010278a1dabf79209de9563c091f 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -77,7 +77,7 @@ roomName = getTextContent(document.getElementById("rmname"));
      var SortBy = currentSortMode[0];
      if (SortBy.charAt(0) == 'r') {
        SortBy = SortBy.substr(1);
-       parameters["SortOrder"] = "2";
+       parameters["SortOrder"] = "0";
      }
      parameters["SortBy"] = SortBy;
    }
@@ -158,7 +158,7 @@ function loadMessages(transport) {
   currentSorterToggle = toggles[sortmode];
   }
   if (!is_safe_mode) {
-  resortAndDisplay(sortRowsByDateDescending);
+  resortAndDisplay(currentSortMode[1]);
   } else {
     setupPageSelector();
     resortAndDisplay(null);
@@ -231,25 +231,25 @@ function sortRowsByDateDescending(a, b) {
 function sortRowsBySubjectAscending(a, b) {
   var subjectOne = getTextContent(a.getElementsByTagName("td")[0]).toLowerCase();
   var subjectTwo = getTextContent(b.getElementsByTagName("td")[0]).toLowerCase();
-  return (subjectOne.charCodeAt(0) - subjectTwo.charCodeAt(0));
+  return strcmp(subjectOne, subjectTwo);
 }
 
 function sortRowsBySubjectDescending(a, b) {
   var subjectOne = getTextContent(a.getElementsByTagName("td")[0]).toLowerCase();
   var subjectTwo = getTextContent(b.getElementsByTagName("td")[0]).toLowerCase();
-  return (subjectTwo.charCodeAt(0) - subjectOne.charCodeAt(0));
+  return strcmp(subjectTwo, subjectOne);
 }
 
 function sortRowsByFromAscending(a, b) {
   var fromOne = getTextContent(a.getElementsByTagName("td")[1]).toLowerCase();
   var fromTwo = getTextContent(b.getElementsByTagName("td")[1]).toLowerCase();
-  return (fromOne.charCodeAt(0) - fromTwo.charCodeAt(0));
+  return strcmp(fromOne, fromTwo);
 }
 
 function sortRowsByFromDescending(a, b) {
   var fromOne = getTextContent(a.getElementsByTagName("td")[1]).toLowerCase();
   var fromTwo = getTextContent(b.getElementsByTagName("td")[1]).toLowerCase();
-  return (fromTwo.charCodeAt(0) - fromOne.charCodeAt(0));
+  return strcmp(fromTwo, fromOne);
 }
 
 function CtdlMessageListClick(evt) {
@@ -263,7 +263,7 @@ function CtdlMessageListClick(evt) {
     unmarkAllRows();
     markedRowId = parent.ctdlRowId;
     document.getElementById("preview_pane").innerHTML = "";
-    new Ajax.Updater('preview_pane', 'msg/'+msgId, {method: 'get'});
+    new Ajax.Updater('preview_pane', 'msg/'+msgId+'?Mail=1', {method: 'get'});
     markRow(parent);
     new Ajax.Request('ajax_servcmd', {
       method: 'post',
@@ -373,9 +373,8 @@ function deleteAllMarkedRows() {
   rowArray = newRowArray;
   resortAndDisplay(null);
 }
-function CtdlMessageListKeyUp(event) {
-  var key = event.which;
-  if (key == 46) { // DELETE
+
+function deleteAllSelectedMessages() {
     for(msgId in currentlyMarkedRows) {
       if (!room_is_trash) {
       new Ajax.Request('ajax_servcmd', 
@@ -389,7 +388,13 @@ function CtdlMessageListKeyUp(event) {
     }
     document.getElementById("preview_pane").innerHTML = "";
     deleteAllMarkedRows();
-  }
+}
+
+function CtdlMessageListKeyUp(event) {
+       var key = event.which;
+       if (key == 46) { // DELETE
+               deleteAllSelectedMessages();
+       }
 }
 
 function clearMessage(msgId) {