Profile editor - Sort/drag usability fix

diff --git a/css/crm.designer.css b/css/crm.designer.css
index 755c1820b38b87aa87355e100a2bc69504b9e8ee..2b5e8c1dc80241015524ee5151d8e9c2943fc706 100644 (file)
--- a/css/crm.designer.css
+++ b/css/crm.designer.css
@@ -57,10 +57,6 @@
   cursor: move;
 }
 
-.crm-designer-palette .crm-designer-palette-field.disabled a {
-  cursor: default;
-}
-
 .crm-designer-palette .crm-designer-palette-field:hover,
 .crm-designer-fields-region .crm-designer-row:hover,
 .crm-designer-open .crm-designer-row,
@@ -70,6 +66,11 @@
   background-color: #E9E9F5;
 }
 
+.crm-designer-palette .crm-designer-palette-field.disabled a,
+.crm-designer-open .crm-designer-row:hover {
+  cursor: default;
+}
+
 .crm-container .crm-designer-palette .crm-designer-palette-tree a {
   color: #222;
   font-style: normal;

diff --git a/js/view/crm.designer.js b/js/view/crm.designer.js
index 5614e5222c61d66cf25b7d0f6be0a6b533090725..1dc087c6b0b1364665ebeb6cef28266a4a3e607f 100644 (file)
--- a/js/view/crm.designer.js
+++ b/js/view/crm.designer.js
@@ -535,6 +535,7 @@
       this.$(".crm-designer-fields").sortable({
         placeholder: 'crm-designer-row-placeholder',
         forcePlaceholderSize: true,
+        cancel: 'input,textarea,button,select,option,a,.crm-designer-open',
         receive: function(event, ui) {
           var paletteFieldModel = ufFieldCanvasView.model.getRel('paletteFieldCollection').get(ui.item.attr('data-plm-cid'));
           var ufFieldModel = paletteFieldModel.addToUFCollection(