Adjust the folder counters when reading / deleting / moving messages

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

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index f3964c053d423a1e0b8495531b68d422eacd254b..a57ecef7012998ae8c4fcc8219aabe5d5321c1cf 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -35,9 +35,6 @@ var currentlyHasRowsSelected = false;
 var mouseDownEvent = null;
 var exitedMouseDown = false;
 
-var is_shift_pressed = false;
-var is_ctrl_pressed = false;
-
 var originalMarkedRow = null;
 var previousFinish = 0;
 var markedFrom = 0;
@@ -65,6 +62,14 @@ var toggles = {};
 
 var nummsgs = 0;
 var startmsg = 0;
+var newmsgs = 0;
+
+function refreshMessageCounter() {
+    var templStr = document.getElementById("nummsgs_template").innerHTML;
+    templStr = templStr.replace(/UNREADMSGS/, newmsgs);
+    templStr = templStr.replace(/TOTALMSGS/,  nummsgs);
+    document.getElementById("nummsgs").innerHTML = templStr;
+}
 
 function createMessageView() {
        message_view = document.getElementById("message_list_body");
@@ -82,7 +87,6 @@ function createMessageView() {
        mlh_date.observe('click',ApplySort);
        mlh_subject.observe('click',ApplySort);
        mlh_from.observe('click',ApplySort);
-       $(document).observe('keydown',CtdlMessageListKeyDown,false);
        $(document).observe('keyup',CtdlMessageListKeyUp,false);
        $('resize_msglist').observe('mousedown', CtdlResizeMouseDown);
        $('m_refresh').observe('click', getMessages);
@@ -152,6 +156,7 @@ function loadMessages(transport) {
                        alert("Message loading failed");
                } 
                nummsgs = data['nummsgs'];
+               newmsgs =  data['newmsgs'];
                msgs = data['msgs'];
                var length = msgs.length;
                rowArray = new Array(length); // store so they can be sorted
@@ -176,6 +181,7 @@ function loadMessages(transport) {
                loadingMsg.parentNode.removeChild(loadingMsg);
        }
        sizePreviewPane();
+        refreshMessageCounter();
 }
 function resortAndDisplay(sortMode) {
        WCLog("Begin resortAndDisplay");
@@ -229,7 +235,7 @@ function resortAndDisplay(sortMode) {
        var compile = compiled.join("");
        start = new Date();
        $(message_view_parent).update(compile);
-       message_view_parent.onclick = CtdlMessageListClick;
+       message_view_parent.observe('click', CtdlMessageListClick);
        message_view = message_view_parent.firstChild;
        end = new Date();
        var delta = end.getTime() - start.getTime();
@@ -273,6 +279,24 @@ 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 = event.shiftKey;
+       var is_ctrl_pressed = event.ctrlKey;
+        var rowclass = parent.getAttribute("class");
+        var msgUnseen = rowclass.search("new_message") >= 0;
+
+/* debugging
+       str = '.';
+       if (is_shift_pressed) {
+               str = str + 'S';
+       }
+       str = str + '.';
+       if (is_ctrl_pressed) {
+               str = str + 'C';
+       }
+       str = str + '.';
+       $('ib_summary').innerHTML = str;
+*/
+
        // If the ctrl key modifier wasn't used, unmark all rows and load the message
        if (!is_shift_pressed && !is_ctrl_pressed) {
                previousFinish = 0;
@@ -283,12 +307,15 @@ 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', {
+
+               if (msgUnseen) {
+                   var p = encodeURI('g_cmd=SEEN ' + msgId + '|1');
+                   new Ajax.Request('ajax_servcmd', {
                        method: 'post',
                        parameters: p,
                        onComplete: CtdlMarkRowAsRead(parent)
-               });
+                   });
+               }
                // If the shift key modifier is used, mark a range...
        } else if (event.button != 2 && is_shift_pressed) {
                if (originalMarkedRow == null) {
@@ -332,6 +359,8 @@ function CtdlMarkRowAsRead(rowElement) {
        var classes = rowElement.className;
        classes = classes.replace("new_message","");
        rowElement.className = classes;
+        newmsgs--;
+       refreshMessageCounter();
 }
 function ApplySort(event) {
        var target = event.target;
@@ -394,10 +423,16 @@ function unmarkAllRows() {
 function deleteAllMarkedRows() {
        for(msgId in currentlyMarkedRows) {
                var row = currentlyMarkedRows[msgId];
+               var rowclass = row.getAttribute("class");
+               var msgUnseen = rowclass.search("new_message") >= 0;
+
                var rowArrayId = row.getAttribute("citadel:ctdlrowid");
                row.parentNode.removeChild(row);
                delete currentlyMarkedRows[msgId];
                delete msgs[rowArrayId];
+               if (msgUnseen)
+                   newmsgs--;
+               nummsgs--;
        }
        // Now we have to reconstruct rowarray as the array length has changed */
        var newMsgs = new Array(msgs.length-1);
@@ -411,6 +446,7 @@ function deleteAllMarkedRows() {
        }
        msgs = newMsgs;
        resortAndDisplay(null);
+       refreshMessageCounter();
 }
 function deleteAllSelectedMessages() {
     var mvCommand = "";
@@ -455,45 +491,12 @@ function deleteAllSelectedMessages() {
 }
 
 
-function arrgggh() {
-       s = '.';
-       if (is_shift_pressed) {
-               s = s + 'S';
-       }
-       s = s + '.';
-       if (is_ctrl_pressed) {
-               s = s + 'C';
-       }
-       s = s + '.';
-       $('ib_summary').innerHTML = s;
-               
-}
-
-function CtdlMessageListKeyDown(event) {
-       var key = event.which || event.keyCode;
-
-       if (key == 16) {                                /* SHIFT */
-               is_shift_pressed = true;
-       }
-       else if ( (key == 17) || (key == 18) ) {        /* CTRL or ALT */
-               is_ctrl_pressed = true;
-       }
-       arrgggh();
-}
-
 function CtdlMessageListKeyUp(event) {
        var key = event.which || event.keyCode;
 
-       if (key == 16) {                                /* SHIFT */
-               is_shift_pressed = false;
-       }
-       else if ( (key == 17) || (key == 18) ) {        /* CTRL or ALT */
-               is_ctrl_pressed = false;
-       }
-       else if (key == 46) {                           /* DELETE */
+       if (key == 46) {                                /* DELETE */
                deleteAllSelectedMessages();
        }
-       arrgggh();
 }
 
 function clearMessage(msgId) {