* This change appears to restore ctrl-click's ability to deselect a currently selecte...

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

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index eb9e2ebe1119164791002c6d314f383884d70057..03336fe0b18c5fbf1723d7955fa0f48546884c19 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -20,7 +20,7 @@ var mlh_from = null;
 var currentSorterToggle = null;
 var query = "";
 var currentlyMarkedRows = new Object();
-var markedRowId = null;
+var markedRowIndex = null;
 
 var mouseDownEvent = null;
 var exitedMouseDown = false;
@@ -28,11 +28,12 @@ var exitedMouseDown = false;
 var trTemplate = new Array(11);
 trTemplate[0] = "<tr id=\"";
 trTemplate[2] = "\" citadel:dropenabled=\"dropenabled\" class=\"";
-trTemplate[4] = "\" citadel:dndelement=\"summaryViewDragAndDropHandler\" citadel:msgID=\"";
-trTemplate[6] = "\"><td class=\"col1\">";
-trTemplate[8] = "</td><td class=\"col2\">";
-trTemplate[10] = "</td><td class=\"col3\">";
-trTemplate[12] = "</td></tr>";
+trTemplate[4] = "\" citadel:dndelement=\"summaryViewDragAndDropHandler\" citadel:msgid=\"";
+trTemplate[6] = "\" citadel:ctdlrowid=\"";
+trTemplate[8] = "\"><td class=\"col1\">";
+trTemplate[10] = "</td><td class=\"col2\">";
+trTemplate[12] = "</td><td class=\"col3\">";
+trTemplate[14] = "</td></tr>";
 
 var currentPage = 0;
 var sortModes = {
@@ -106,9 +107,15 @@ new Ajax.Request("roommsgs", {
        });
 }
 function evalJSON(data) {
+  var jsonData = null;
   if (typeof(JSON) === 'object' && typeof(JSON.parse) === 'function') {
-    return JSON.parse(data);
-  } else {
+    try {
+    jsonData = JSON.parse(data);
+    } catch (e) {
+      // ignore
+    }
+  }
+  if (jsonData == null) {
     return eval('('+data+')');
   }
 }
@@ -176,13 +183,14 @@ function resortAndDisplay(sortMode) {
     }
     trTemplate[3] = className;
     trTemplate[5] = currentRow[0];
-    trTemplate[7] = currentRow[1];
-    trTemplate[9] = currentRow[2];
-    trTemplate[11] = currentRow[4];
+    trTemplate[7] = x;
+    trTemplate[9] = currentRow[1];
+    trTemplate[11] = currentRow[2];
+    trTemplate[13] = currentRow[4];
     var i = x+1;
     compiled[i] = trTemplate.join("");
     } catch (e) {
-      alert("Exception on row " +  x + ":" + e);
+      WCLog("Exception on row " +  x + ":" + e);
     }
   }
   compiled[length+2] = "</tbody>";
@@ -238,7 +246,7 @@ function CtdlMessageListClick(evt) {
   // If the ctrl key modifier wasn't used, unmark all rows and load the message
   if (!event.shiftKey && !event.ctrlKey && !event.altKey) {
     unmarkAllRows();
-    markedRowId = parent.ctdlRowId;
+    markedRowIndex = parent.rowIndex;
     document.getElementById("preview_pane").innerHTML = "";
     new Ajax.Updater('preview_pane', 'msg/'+msgId, {method: 'get'});
     markRow(parent);
@@ -249,23 +257,24 @@ function CtdlMessageListClick(evt) {
   // If the shift key modifier is used, mark a range...
   } else if (event.button != 2 && event.shiftKey) {
     markRow(parent);
-    var rowId = parent.ctdlRowId;
+    var rowIndex = parent.rowIndex;
     var startMarkingFrom = 0;
     var finish = 0;
-    if (rowId > markedRowId) {
-      startMarkingFrom = markedRowId+1;
-      finish = rowId;
-    } else if (rowId < markedRowId) {
-      startMarkingFrom = rowId+1;
-      finish = markedRowId;
-    } 
+    if (rowIndex > markedRowIndex) {
+      startMarkingFrom = markedRowIndex+1;
+      finish = rowIndex;
+    } else if (rowIndex < markedRowIndex) {
+      startMarkingFrom = rowIndex+1;
+      finish = markedRowIndex;
+    }
+    WCLog('startMarkingFrom=' + startMarkingFrom + ', finish=' + finish);
     for(var x = startMarkingFrom; x<finish; x++) {
-      WCLog("Marking row "+x);
-      markRow(rowArray[x]);
+      WCLog("Marking row " + x);
+      markRow(parent.parentNode.rows[x]);
     }
   // If the ctrl key modifier is used, toggle one message
   } else if (event.button != 2 && (event.ctrlKey || event.altKey)) {
-    if (parent.ctdlMarked == true) {
+    if (parent.getAttribute("citadel:marked")) {
       unmarkRow(parent);
     }
     else {