From a1d356e4c0aa14b7ddc85ab737d02b15abf6a34e Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 13 Mar 2012 16:17:07 +0000
Subject: [PATCH] See ChangeLog.

Monotone-Parent: 482498d8717f020bae6132b015e69ae97d3e30aa
Monotone-Revision: fc82f5d2ff1a83e0f7d507e8ab1bb5149bbbec24

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-03-13T16:17:07
---
 ChangeLog                            |  5 +++++
 NEWS                                 |  8 ++++++++
 UI/WebServerResources/ContactsUI.css |  3 ++-
 UI/WebServerResources/ContactsUI.js  | 21 ++++++++++++---------
 UI/WebServerResources/MailerUI.css   |  4 +++-
 UI/WebServerResources/MailerUI.js    |  8 ++++++--
 6 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7009eb137..ec00980fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-03-13  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/ContactsUI.js (configureDraggables):
+	increased the delay before starting drag and drop.
+
+	* UI/WebServerResources/MailerUI.js (configureDraggables): idem.
+
 	* UI/WebServerResources/UIxAclEditor.js (addUser): fixed
 	positioning of new user.
 
diff --git a/NEWS b/NEWS
index 9af1866f0..109b0360f 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ New Features
 
 Enhancements
  - bundled a shell script to perform and manage backups using sogo-tool
+ - increased the delay before starting drag and drop in Mail and Contacts module
+  to improve the user experience with cheap mouses
 
 Bug Fixes
  - fixed escaping issue with PostgreSQL 8.1
@@ -18,6 +20,12 @@ Bug Fixes
  - fixed Spanish (Argentina) templates for mail reply and forward
  - we don't show public address books (from SOGoUserSources) on iOS 5.0.1
 
+1.3.12c (2012-02-15)
+-------------------
+
+Bug Fixes
+ - fixed a possible crash when using a SQL source
+
 1.3.12b (2012-02-14)
 -------------------
 
diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css
index ecea7053f..a1ef1dc4a 100644
--- a/UI/WebServerResources/ContactsUI.css
+++ b/UI/WebServerResources/ContactsUI.css
@@ -27,7 +27,8 @@ DIV#rightPanel
   right: 0px;
   bottom: 0px;
   overflow: hidden;
-}
+  -moz-user-select: none;
+  -khtml-user-select: none; }
 
 /* top list */
 DIV#contactsListContent
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index a2f5967dd..53bfdfff1 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -768,6 +768,7 @@ function onAddressBookExport(event) {
     window.location.href = url;
 
     event.stop();
+    hideMenu(document.currentPopupMenu);
 }
 
 function onAddressBookImport(event) {
@@ -1480,19 +1481,19 @@ function configureDraggables() {
         Draggables.empty();
     
         if (mainElement == null) {
-            mainElement = new Element ("div", {id: "dragDropVisual"});
+            mainElement = new Element("div", {id: "dragDropVisual"});
             document.body.appendChild(mainElement);
             mainElement.absolutize();
         }
         mainElement.hide();
     
-        new Draggable ("dragDropVisual", 
-                       { handle: "contactsList", 
-                               onStart: startDragging,
-                               onEnd: stopDragging,
-                               onDrag: whileDragging,
-                               scroll: window
-                           }); 
+        new Draggable("dragDropVisual", 
+                      { handle: "contactsList", 
+                        onStart: startDragging,
+                        onEnd: stopDragging,
+                        onDrag: whileDragging,
+                        scroll: window,
+                        delay: 250 }); 
     }
 }
 
@@ -1523,7 +1524,8 @@ function startDragging (itm, e) {
     var target = Event.element(e);
     if (target.up().up().tagName != "TBODY")
         return false;
-    
+
+    $("contactsListContent").setStyle({ overflow: "visible" });
     var handle = $("dragDropVisual");
     var contacts = $('contactsList').getSelectedRowsId();
     var count = contacts.length;
@@ -1551,6 +1553,7 @@ function whileDragging (itm, e) {
 }
 
 function stopDragging () {
+    $("contactsListContent").setStyle({ overflow: "auto" });
     var handle = $("dragDropVisual");
     handle.hide();
     if (handle.hasClassName ("copy"))
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 7e4bbf453..43e9b20d8 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -40,7 +40,9 @@ DIV#rightPanel
   margin: 0px;
   margin-left: 5px;
   padding: 0px;
-  overflow: hidden; }
+  overflow: hidden;
+  -moz-user-select: none;
+  -khtml-user-select: none; }
 
 /* top list */
 DIV#mailboxContent
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 6e6f414a9..99fcfd3a4 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2928,7 +2928,7 @@ function configureDraggables() {
                     onEnd: stopDragging,
                     onDrag: whileDragging,
                     scroll: "folderTreeContent",
-                    delay: 100 });
+                    delay: 250 });
 }
 
 function configureDroppables() {
@@ -2961,6 +2961,8 @@ function startDragging (itm, e) {
     if (target.up('TBODY') == undefined)
         return;
 
+    $("mailboxList").setStyle({ overflow: "visible" });
+
     var row = target.up('TR');
     var handle = $("dragDropVisual");
     var selectedIds = $("messageListBody").getSelectedRowsId();
@@ -2996,7 +2998,9 @@ function whileDragging (itm, e) {
     }
 }
 
-function stopDragging () {
+function stopDragging() {
+    console.info("stop dragging");
+    $("mailboxList").setStyle({ overflow: "auto" });
     var handle = $("dragDropVisual");
     handle.hide();
     if (handle.hasClassName("copy"))