From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 program/js/list.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/js/list.js b/program/js/list.js
index e2fd828..368ee5b 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -307,7 +307,7 @@
   if (rcube_event.get_button(e) == 2)
     return true;
 
-  this.in_selection_before = e.istouch || this.in_selection(id) ? id : false;
+  this.in_selection_before = e && e.istouch || this.in_selection(id) ? id : false;
 
   // selects currently unselected row
   if (!this.in_selection_before) {

--
Gitblit v1.9.1