Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

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

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index f3964c053d423a1e0b8495531b68d422eacd254b..1e1e2d94eab5a93f77d30852bdb17c9f9dbc3251 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;
@@ -82,7 +79,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);
@@ -229,7 +225,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 +269,22 @@ 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;
+
+/* 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;
@@ -455,45 +467,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) {