From e5193ddbac54ba87e244e33ec48e17c0bae260a6 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 22 Mar 2012 15:48:03 +0000
Subject: [PATCH] Monotone-Parent: 3c8a49fe7ef93ec55aaeef9dd064be1de6052cfe
 Monotone-Revision: 04d242cd3ae3982c5087b5bef22fc2d70632130f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-03-22T15:48:03
---
 UI/WebServerResources/ContactsUI.js | 6 ++++--
 UI/WebServerResources/MailerUI.js   | 9 ++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 53bfdfff1..5da389bf9 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1493,7 +1493,7 @@ function configureDraggables() {
                         onEnd: stopDragging,
                         onDrag: whileDragging,
                         scroll: window,
-                        delay: 250 }); 
+                        delay: 250 });
     }
 }
 
@@ -1521,6 +1521,8 @@ function currentFolderIsRemote () {
 }
 
 function startDragging (itm, e) {
+    if (!Event.isLeftClick(e))
+        return false;
     var target = Event.element(e);
     if (target.up().up().tagName != "TBODY")
         return false;
@@ -1553,7 +1555,7 @@ function whileDragging (itm, e) {
 }
 
 function stopDragging () {
-    $("contactsListContent").setStyle({ overflow: "auto" });
+    $("contactsListContent").setStyle({ overflow: "auto", overflowX: "hidden" });
     var handle = $("dragDropVisual");
     handle.hide();
     if (handle.hasClassName ("copy"))
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 23cab23c3..dbe9147fd 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2741,8 +2741,6 @@ function onMenuArchiveFolder(event) {
     var folderID = document.menuTarget.getAttribute("dataname");
     var url = URLForFolderID(folderID) + "/exportFolder";
     window.location.href = url;
-
-    event.stop();
 }
 
 function onMenuAccountDelegation(event) {
@@ -2957,9 +2955,11 @@ function configureDroppables() {
 }
 
 function startDragging (itm, e) {
+    if (!Event.isLeftClick(e))
+        return false;
     var target = Event.element(e);
     if (target.up('TBODY') == undefined)
-        return;
+        return false;
 
     $("mailboxList").setStyle({ overflow: "visible" });
 
@@ -2999,8 +2999,7 @@ function whileDragging (itm, e) {
 }
 
 function stopDragging() {
-    console.info("stop dragging");
-    $("mailboxList").setStyle({ overflow: "auto" });
+    $("mailboxList").setStyle({ overflow: "auto", overflowX: "hidden" });
     var handle = $("dragDropVisual");
     handle.hide();
     if (handle.hasClassName("copy"))