* fix issues with room list in firefox 2 (didn't detect console.log properly, again)

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

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index d686980c1028d911206f602fb2982c21e367c383..9aaa17b15f6b5567cf4489ec4e2577168905db97 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -30,11 +30,7 @@ var sortModes = {
   "rsender" : sortRowsByFromDescending
 };
 var toggles = {};
-window.console = window.console || {};
-var opera = opera || null;
-if (opera && opera.postError) {
-  console.log = opera.postError;
-}
+
 var nummsgs = 0;
 var startmsg = 0;
 function createMessageView() {
@@ -64,6 +60,7 @@ function createMessageView() {
   Event.observe(document.onresize ? document : window, "resize", sizePreviewPane);
   $('summpage').observe('change', getPage);
   takeOverSearchOMatic();
+  setupDragDrop(); // here for now
 }
 function getMessages() {
   if (loadingMsg.parentNode == null) {
@@ -132,9 +129,7 @@ function loadMessages(transport) {
       var classStmt = "col"+x;
       tdElement.setAttribute("class", classStmt);
        } catch (e) {
-         if (!!window.console) {
-           console.log("Error on #"+msgId +" col"+j+":"+e);
-         }
+         WCLog("Error on #"+msgId +" col"+j+":"+e);
        }
       }
     }
@@ -147,10 +142,8 @@ function loadMessages(transport) {
     rowArray[i] = trElement; 
   } 
   var end = new Date();
-  if (!!window.console) {
-    var delta = end.getTime() - start.getTime();
-    console.log("loadMessages construct: " + delta);
-  }
+  var delta = end.getTime() - start.getTime();
+    WCLog("loadMessages construct: " + delta);
   } catch (e) {
     window.alert(e);
   }
@@ -202,10 +195,8 @@ function resortAndDisplay(sortMode) {
   }
   message_view.appendChild(fragment);
   var end = new Date();
-  if (!!window.console) {
     var delta = end.getTime() - start.getTime();
-    console.log("resortAndDisplay sort and append: " + delta);
-  }
+    WCLog("resortAndDisplay sort and append: " + delta);
   ApplySorterToggle();
   normalizeHeaderTable();
 }
@@ -250,8 +241,8 @@ function CtdlMessageListClick(evt) {
   var target = event.target ? event.target: event.srcElement; // and again..
   var parent = target.parentNode;
   var msgId = parent.ctdlMsgId;
-  // If the shift key modifier wasn't used, unmark all rows and load the message
-  if (!event.shiftKey) {
+  // If the ctrl key modifier wasn't used, unmark all rows and load the message
+  if (!event.shiftKey && !event.ctrlKey) {
     unmarkAllRows();
     new Ajax.Updater('preview_pane', 'msg/'+msgId, {method: 'get'});
     markRow(parent);