From 8a6ce84cb774aa1ad4bf97edc2dbc5b04954969e Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 28 Aug 2008 15:53:33 +0000
Subject: [PATCH] Monotone-Parent: 7cc3351f7b4c30b2183e351afaf429ade9f6ab9b
 Monotone-Revision: 649a1187cf216e088818ea020c5b497e84dd0fa4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-28T15:53:33
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/MailerUI.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index d674c7a73..addc282af 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -43,7 +43,12 @@ function openMessageWindow(msguid, url) {
   var wId = '';
   if (msguid) {
     wId += "SOGo_msg" + msguid;
-    markMailReadInWindow(window, msguid);
+// 		var url = ApplicationBaseURL + msguid + "/markMessageRead";
+// 		var parts = msguid.split("/");
+// 		var data = { "window": window, "msguid": parts[parts.length-1], "markread": true };
+// 		triggerAjaxRequest(url, mailListMarkMessageCallback, data);
+
+//     markMailInWindow(window, msguid, true);
   }
   var msgWin = openMailComposeWindow(url, wId);
   msgWin.messageUID = msguid;
@@ -129,17 +134,13 @@ function markMailInWindow(win, msguid, markread) {
 					img.setAttribute("title", title);
       }
     }
+		
     return true;
   }
   else
     return false;
 }
 
-function markMailReadInWindow(win, msguid) {
-  /* this is called by UIxMailView with window.opener */
-  return markMailInWindow(win, msguid, true);
-}
-
 /* mail list reply */
 
 function openMessageWindowsForSelection(action, firstOnly) {
@@ -170,6 +171,7 @@ function openMessageWindowsForSelection(action, firstOnly) {
 }
 
 function mailListMarkMessage(event) {
+	log("maillistmarkmessage...");
   var msguid = this.id.split('_')[1];
   var action;
   var markread;
@@ -754,6 +756,7 @@ function onMessageSelectionChange() {
 }
 
 function loadMessage(idx) {
+	log("loadMessage: " + idx);
   if (document.messageAjaxRequest) {
     document.messageAjaxRequest.aborted = true;
     document.messageAjaxRequest.abort();
@@ -761,7 +764,6 @@ function loadMessage(idx) {
 
   var cachedMessage = getCachedMessage(idx);
 
-  markMailInWindow(window, idx, true);
   if (cachedMessage == null) {
     var url = (ApplicationBaseURL + Mailer.currentMailbox + "/"
 							 + idx + "/view?noframe=1");
@@ -941,6 +943,10 @@ function messageCallback(http) {
       cachedMessage['text'] = http.responseText;
       if (cachedMessage['text'].length < 30000)
 				storeCachedMessage(cachedMessage);
+
+			var url = ApplicationBaseURL + Mailer.currentMailbox + "/" + http.callbackData + "/markMessageRead";
+			var data = { "window": window, "msguid": http.callbackData, "markread": true };
+			triggerAjaxRequest(url, mailListMarkMessageCallback, data);
     }
   }
   else
@@ -1219,20 +1225,20 @@ function configureMessageListBodyEvents(table) {
 			row.observe("mousedown", onRowClick);
 			row.observe("selectstart", listRowMouseDownHandler);
 			row.observe("contextmenu", onMessageContextMenu);
-         
+
 			row.dndTypes = function() { return new Array("mailRow"); };
 			row.dndGhost = messageListGhost;
 			row.dndDataForType = messageListData;
 			//   document.DNDManager.registerSource(row);
-         
+
 			for (var j = 0; j < row.cells.length; j++) {
 				var cell = $(row.cells[j]);
 				cell.observe("mousedown", listRowMouseDownHandler);
 				if (j == 2 || j == 3 || j == 5)
-					cell.observe("dblclick", onMessageDoubleClick.bindAsEventListener(cell));
+					cell.observe("dblclick", onMessageDoubleClick);
 				else if (j == 4) {
 					var img = $(cell.childNodesWithTag("img")[0]);
-					img.observe("click", mailListMarkMessage.bindAsEventListener(img));
+					img.observe("click", mailListMarkMessage);
 				}
 			}
 		}