From 285825eb67d71f74967c59d690f40a002d542b64 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 17 May 2007 17:25:45 +0000
Subject: [PATCH] Monotone-Parent: 6b1767e51b6a4a9ee800a715b9c31d92d2e7cfaa
 Monotone-Revision: 6e1fa9dae975f5a8d923b0d451cd9551b0f14f4c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-17T17:25:45
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/MailerUI/UIxMailView.wox | 15 ++++-----------
 UI/WebServerResources/MailerUI.js     | 14 ++++++++++----
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index 07966734c..965cc1975 100644
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -18,7 +18,7 @@
         <td class="mailer_fieldvalue">
           <var:foreach list="clientObject.fromEnvelopeAddresses"
             item="currentAddress">
-            <a var:href="currentAddressLink" onclick="return onMenuClick(event, 'addressMenu');" oncontextmenu="onMenuClick(event, 'addressMenu');">
+            <a var:href="currentAddressLink">
               <var:string value="currentAddress"
                 formatter="context.mailEnvelopeFullAddressFormatter" /></a>
           </var:foreach>
@@ -41,10 +41,7 @@
         <td class="mailer_fieldvalue">
           <var:foreach list="clientObject.toEnvelopeAddresses"
             item="currentAddress"
-            ><a var:href="currentAddressLink"
-              onmousedown="return false;"
-              onclick="return onMenuClick(event, 'addressMenu');"
-              oncontextmenu="onMenuClick(event, 'addressMenu');">
+            ><a var:href="currentAddressLink">
               <var:string value="currentAddress"
                 formatter="context.mailEnvelopeFullAddressFormatter"
                 /></a>
@@ -58,10 +55,7 @@
             <var:foreach list="clientObject.ccEnvelopeAddresses" 
               item="currentAddress">
               <a var:href="currentAddressLink"
-                onclick="return onMenuClick(event, 'addressMenu');"
-                oncontextmenu="onMenuClick(event, 'addressMenu');"
-                onmousedown="return false;"
-                ><var:string value="currentAddress"
+		><var:string value="currentAddress"
                   formatter="context.mailEnvelopeFullAddressFormatter"
                   /></a>
               <!-- TODO: better to use li+CSS -->
@@ -71,8 +65,7 @@
       </var:if>
     </table>
 
-    <div class="mailer_mailcontent"
-      oncontextmenu="onMenuClick(event, 'messageContentMenu');">
+    <div class="mailer_mailcontent">
       <var:component value="contentViewerComponent"
         bodyInfo="clientObject.bodyStructure" />
     </div>
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index e8f9dee5e..20739d874 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -630,10 +630,11 @@ function loadMessage(idx) {
 }
 
 function configureLinksInMessage() {
-   var parentDiv = $('messageContent');
-   var div = document.getElementsByClassName('mailer_mailcontent',
-					     parentDiv)[0];
-   var anchors = div.getElementsByTagName('a');
+   var messageDiv = $('messageContent');
+   var mailContentDiv = document.getElementsByClassName('mailer_mailcontent',
+							messageDiv)[0];
+   mailContentDiv.addEventListener("contextmenu", onMessageContentMenu, false);
+   var anchors = messageDiv.getElementsByTagName('a');
    for (var i = 0; i < anchors.length; i++)
       if (anchors[i].href.substring(0,7) == "mailto:") {
 	 anchors[i].addEventListener("click", onEmailAddressClick, false);
@@ -644,6 +645,11 @@ function configureLinksInMessage() {
 	 anchors[i].addEventListener("click", onMessageAnchorClick, false);
 }
 
+function onMessageContentMenu(event) {
+   onMenuClick(event, 'messageContentMenu');
+   event.preventDefault();
+};
+
 function onEmailAddressClick(event) {
    onMenuClick(event, 'addressMenu');
    event.preventDefault();