X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fstatic%2Fsummaryview.js;h=f3964c053d423a1e0b8495531b68d422eacd254b;hp=7cf280d8d1aeb3d307249f9d0c854dcd30635f11;hb=d89c2995e621fb8f5cb4c2777277ebef023b14cf;hpb=bf0bd2db0beae4366869d1c9099840ed9ce01e84

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 7cf280d8d..f3964c053 100644
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -35,6 +35,9 @@ 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;
@@ -79,6 +82,7 @@ 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);
@@ -270,7 +274,7 @@ function CtdlMessageListClick(evt) {
 	var parent = target.parentNode;
 	var msgId = parent.getAttribute("citadel:msgid");
 	// If the ctrl key modifier wasn't used, unmark all rows and load the message
-	if (!event.shiftKey && !event.ctrlKey && !event.altKey) {
+	if (!is_shift_pressed && !is_ctrl_pressed) {
 		previousFinish = 0;
 		markedFrom = 0;
 		unmarkAllRows();
@@ -286,7 +290,7 @@ function CtdlMessageListClick(evt) {
 			onComplete: CtdlMarkRowAsRead(parent)
 		});
 		// If the shift key modifier is used, mark a range...
-	} else if (event.button != 2 && event.shiftKey) {
+	} else if (event.button != 2 && is_shift_pressed) {
 		if (originalMarkedRow == null) {
 			originalMarkedRow = parent;
 			markRow(parent);
@@ -315,7 +319,7 @@ function CtdlMessageListClick(evt) {
 			markRow(parent.parentNode.rows[x]);
 		}
 		// If the ctrl key modifier is used, toggle one message
-	} else if (event.button != 2 && (event.ctrlKey || event.altKey)) {
+	} else if (event.button != 2 && is_ctrl_pressed) {
 		if (parent.getAttribute("citadel:marked")) {
 			unmarkRow(parent);
 		}
@@ -450,12 +454,46 @@ function deleteAllSelectedMessages() {
     deleteAllMarkedRows();
 }
 
+
+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 == 46) {			/* DELETE */
+	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 */
 		deleteAllSelectedMessages();
 	}
+	arrgggh();
 }
 
 function clearMessage(msgId) {