From 463752df0d4e74394c7344de1bb9e057bdcd2453 Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Tue, 7 Jul 2009 15:26:51 +0000
Subject: [PATCH] Monotone-Parent: f477b77ceeee0f0f12bc02c70d58dc589a7d9d55
 Monotone-Revision: eb759cedcd41f4bc822816acd58b93115f94f266

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-07T15:26:51
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           |  2 ++
 UI/WebServerResources/ContactsUI.js |  5 +++++
 UI/WebServerResources/MailerUI.js   | 12 +++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 92cffc313..aeb6bba86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	draggable)
 	* UI/WebServerResources/MailerUI.js: Revert
 	* UI/WebServerResources/ContactsUI.js: Revert
+	* UI/WebServerResources/MailerUI.js: Fixed Mantis #45
+	* UI/WebServerResources/ContactsUI.js: Fixed Mantis #45
 
 2009-07-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index e858fdf0a..ee7bd5998 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1147,6 +1147,11 @@ function dropAction (dropped, zone, e) {
   if ($("dragDropVisual").hasClassName ("copy"))
     action = "copy";
   dropSelectedContacts (action, zone.id.substr (1));
+  
+  if (action != "copy") {
+    var div = $('contactView');
+    div.innerHTML = "";
+  }
 }
 
 function dropSelectedContacts (action, toId) {
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 486ae86d8..6f04f99bb 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2292,10 +2292,15 @@ function dropAction (dropped, zone, e) {
   if ($("dragDropVisual").hasClassName ("copy"))
     action = "copy";
 
-  dropSelectedContacts (action, destination);
+  dropSelectedMessages (action, destination);
+
+  if (action != "copy") {
+    var div = $('messageContent');
+    div.innerHTML = "";
+  }
 }
 
-function dropSelectedContacts (action, targetMailbox) {
+function dropSelectedMessages (action, targetMailbox) {
   var messageList = $("messageList").down("TBODY");
   var rows = messageList.getSelectedNodes();
   var uids = new Array(); // message IDs
@@ -2304,7 +2309,8 @@ function dropSelectedContacts (action, targetMailbox) {
   for (var i = 0; i < rows.length; i++) {
     var uid = rows[i].readAttribute("id").substr(4);
     var path = Mailer.currentMailbox + "/" + uid;
-    rows[i].hide();
+    if (action != "copy")
+      rows[i].hide();
     uids.push(uid);
     paths.push(path);
   }