From 8a62ea46936ded3f0c908ec7f2a15413bfa81381 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 8 Jul 2009 15:20:32 +0000 Subject: [PATCH] Fix for DnD that can be initiate from a table header Monotone-Parent: d849bc5a898619537552171931bf3b5141b7618a Monotone-Revision: 13cce380f729a93828b7261702643a96f1d6f502 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-07-08T15:20:32 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/ContactsUI.js | 4 ++++ UI/WebServerResources/MailerUI.js | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index ee7bd5998..90d2bf49e 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -1115,6 +1115,10 @@ function containsVLF (ids) { } function startDragging (itm, e) { + var target = Event.element(e); + if (target.up().up().tagName != "TBODY") + return false; + var handle = $("dragDropVisual"); var contacts = $('contactsList').getSelectedRowsId(); var count = contacts.length; diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index af553566b..5b20e5668 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -2159,13 +2159,17 @@ function configureDragAndDrop () { } function startDragging (itm, e) { + var target = Event.element(e); + if (target.up().up().tagName != "TBODY") + return false; + var handle = $("dragDropVisual"); var count = $('messageList').getSelectedRowsId().length; - handle.style.display = "block"; - handle.update (count); - if (e.shiftKey) - handle.addClassName ("copy"); + handle.style.display = "block"; + handle.update (count); + if (e.shiftKey) + handle.addClassName ("copy"); } function whileDragging (itm, e) {