* 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 767ecbfc53c5fb4208a640e39c84433fdc8f7995..fd7b4f1abfd6010278a1dabf79209de9563c091f 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -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',