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/app.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 0b8bbb2..0674223 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4319,6 +4319,9 @@
           writable = writable || (!source.readonly && !contact.readonly);
       }
 
+      if (contact._type != 'group')
+        list.draggable = true;
+
       this.env.selection_sources = $.unique(this.env.selection_sources);
     }
 
@@ -5054,9 +5057,6 @@
           if (++colprop.count == colprop.limit && colprop.limit)
             $(menu).children('option[value="'+col+'"]').prop('disabled', true);
         }
-
-        if (contact._type != 'group')
-          list.draggable = true;
       }
     }
   };

--
Gitblit v1.9.1