From 590cd157cdc43dea3a2d7d2caefdbcc0d24a00cc Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Wed, 11 Mar 2015 18:20:32 -0300
Subject: [PATCH] container_block: avoid conflict between resizable and draggable functions

---
 plugins/container_block/public/container_block.js | 2 ++
 1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/plugins/container_block/public/container_block.js b/plugins/container_block/public/container_block.js
index 6908396..cbaff77 100644
--- a/plugins/container_block/public/container_block.js
+++ b/plugins/container_block/public/container_block.js
@@ -1,6 +1,7 @@
 function enableMoveContainerChildren(container, box) {
   var div = jQuery('#box-'+box+' > .block-outer > .block');
   if(!div.is('.ui-resizable')) {
+    div.removeClass('ui-draggable');
     div.resizable({
       handles: 'e, w',
       containment: '#block-'+container+' .block-inner-2',
@@ -14,6 +15,7 @@ function enableMoveContainerChildren(container, box) {
 function disableMoveContainerChildren(container, box) {
   var div = jQuery('#box-'+box+' > .block-outer > .block');
   if(div.is('.ui-resizable')) {
+    div.addClass('ui-draggable');
     div.resizable('destroy');
   }
 }
--
libgit2 0.21.2