Monotone-Parent: 48fd12b2868ca8832bcd3a824cf10a332f85bada

Monotone-Revision: 0da4bbe038a2b804a8a8e6ba2b501c33ddc404c0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-09-25T22:09:59
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/MailerUI.js

@@ -637,7 +637,7 @@ function storeCachedMessage(cachedMessage) {
   cachedMessages[oldest] = cachedMessage;
 }
 
-function onMessageSelectionChange() { log ("onMessageSelectionChange");
+function onMessageSelectionChange() {
   var rows = this.getSelectedRowsId();
 
   if (rows.length == 1) {
@@ -868,14 +868,13 @@ function onHeaderClick(event) {
     newSortAttribute = "date";
   else
     newSortAttribute = "arrival";
-  log ("new sort attribute = " + newSortAttribute);
+
   if (sorting["attribute"] == newSortAttribute)
     sorting["ascending"] = !sorting["ascending"];
   else {
     sorting["attribute"] = newSortAttribute;
     sorting["ascending"] = true;
   }
-
   refreshCurrentFolder();
   
   Event.stop(event);
@@ -885,10 +884,6 @@ function refreshCurrentFolder() {
   openMailbox(currentMailbox, true);
 }
 
-function pouetpouet(event) {
-  window.alert("pouet pouet");
-}
-
 var mailboxSpanAcceptType = function(type) {
   return (type == "mailRow");
 }
@@ -1312,12 +1307,13 @@ function onMenuExpungeFolder(event) {
 function onMenuEmptyTrash(event) {
   var folderID = document.menuTarget.getAttribute("dataname");
   var urlstr = URLForFolderID(folderID) + "/emptyTrash";
-  triggerAjaxRequest(urlstr, folderRefreshCallback, folderID);
+  triggerAjaxRequest(urlstr, folderOperationCallback, folderID);
 
   if (folderID == currentMailbox) {
     var div = $('messageContent');
     for (var i = div.childNodes.length - 1; i > -1; i--)
       div.removeChild(div.childNodes[i]);
+    refreshCurrentFolder();
   }
   var msgID = currentMessages[folderID];
   if (msgID)
@@ -1326,7 +1322,7 @@ function onMenuEmptyTrash(event) {
 
 function folderOperationCallback(http) {
   if (http.readyState == 4
-      && http.status == 204)
+      && isHttpStatus204(http.status))
     initMailboxTree();
   else
     window.alert(labels["Operation failed"]);
@@ -1334,7 +1330,7 @@ function folderOperationCallback(http) {
 
 function folderRefreshCallback(http) {
   if (http.readyState == 4
-      && http.status == 204) {
+      && isHttpStatus204(http.status)) {
     var oldMailbox = http.callbackData;
     if (oldMailbox == currentMailbox)
       refreshCurrentFolder();

UI/WebServerResources/generic.css

@@ -415,8 +415,7 @@ TD.tbtv_navcell
   -moz-border-bottom-colors: #000 #9c9a94 transparent;
   -moz-border-right-colors: #000 #9c9a94 transparent; }
 
-TD.headerCell:active,
-TD.tbtv_headercell:active
+TD.sortableTableHeader:active
 { background-color: #dcdad5;
   padding-top: 2px;
   border-top: 1px solid #9c9a94;