From b1f7bb8a504d8e0b7a59d5f976df2ad3272dd5cd Mon Sep 17 00:00:00 2001 From: C Robert Date: Tue, 7 Jul 2009 15:02:52 +0000 Subject: [PATCH 1/4] Monotone-Parent: 7cf3ceccdf6ec58d01bbf1acbd86761895dd9d7b Monotone-Revision: 4e1bb2eb70c5ea73a7dd34b61191210beb5439f0 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-07T15:02:52 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ UI/Templates/ContactsUI/UIxContactsListView.wox | 2 +- UI/WebServerResources/ContactsUI.js | 4 ++-- UI/WebServerResources/MailerUI.js | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65f8b33d5..487929d13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-07-07 Cyril Robert + + * UI/WebServerResources/MailerUI.js: Fixed Drag&Drop issue (header was + draggable) + * UI/WebServerResources/ContactsUI.js: Fixed Drag&Drop issue (header was + draggable) + 2009-07-03 Wolfgang Sourdeau * UI/Scheduler/UIxCalListingActions.m (-eventsBlocksAction): added diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox index 01136fc88..fd458b5d6 100644 --- a/UI/Templates/ContactsUI/UIxContactsListView.wox +++ b/UI/Templates/ContactsUI/UIxContactsListView.wox @@ -23,7 +23,7 @@ > - + Date: Tue, 7 Jul 2009 15:08:11 +0000 Subject: [PATCH 2/4] Monotone-Parent: 4e1bb2eb70c5ea73a7dd34b61191210beb5439f0 Monotone-Revision: 57d2e167583adbd4475204645de003a2e089bd24 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-07T15:08:11 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/ContactsUI.js | 2 +- UI/WebServerResources/MailerUI.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 568522363..e858fdf0a 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -1076,7 +1076,7 @@ function configureDragAndDrop () { new Draggable ("dragDropVisual", { - handle: "contactsListTbody", + handle: "contactsList", onStart: startDragging, onEnd: stopDragging, onDrag: whileDragging diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 412abdcaa..37c4dee3a 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -2244,7 +2244,7 @@ function configureDragAndDrop () { new Draggable ("dragDropVisual", { - handle: tbody.identify (), + handle: /*tbody.identify ()*/ "messageList", onStart: startDragging, onEnd: stopDragging, onDrag: whileDragging From 883cd446354114d5aba3df2e9583ed9eedabb010 Mon Sep 17 00:00:00 2001 From: C Robert Date: Tue, 7 Jul 2009 15:14:59 +0000 Subject: [PATCH 3/4] Monotone-Parent: 57d2e167583adbd4475204645de003a2e089bd24 Monotone-Revision: f477b77ceeee0f0f12bc02c70d58dc589a7d9d55 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-07T15:14:59 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 2 ++ UI/WebServerResources/MailerUI.js | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 487929d13..92cffc313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ draggable) * UI/WebServerResources/ContactsUI.js: Fixed Drag&Drop issue (header was draggable) + * UI/WebServerResources/MailerUI.js: Revert + * UI/WebServerResources/ContactsUI.js: Revert 2009-07-03 Wolfgang Sourdeau diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 37c4dee3a..486ae86d8 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -2240,11 +2240,9 @@ function configureDragAndDrop () { mainElement.absolutize (); mainElement.style.display = "none"; - var tbody = $$("TABLE#messageList tbody").first (); - new Draggable ("dragDropVisual", { - handle: /*tbody.identify ()*/ "messageList", + handle: "messageList", onStart: startDragging, onEnd: stopDragging, onDrag: whileDragging From 463752df0d4e74394c7344de1bb9e057bdcd2453 Mon Sep 17 00:00:00 2001 From: C Robert Date: Tue, 7 Jul 2009 15:26:51 +0000 Subject: [PATCH 4/4] 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 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); }