scrivito_sdk 1.4.0.rc1 → 1.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bed29ff11b6133cbfaaade6b2f4b4803068f4760
-  data.tar.gz: 7ae4f9b89159e0449c6afd81d1450da6922b8220
+  metadata.gz: d1bbfe00ef1710d09ff2d7363a604e3238f14742
+  data.tar.gz: 36c6feecc6d525c42552c5bbc92a253fefc5757d
 SHA512:
-  metadata.gz: d28ad9f4af8da651d3bc248bb5680e5aa570756250dd9738271a7f836e5af4dbd71dca55541ea7c684809e36395d906cdcb5a9f58d0da71d31a72c19bf0daef8
-  data.tar.gz: efcc8b24d207de22312753441050cfc5f655933e56fd848804c8d96e9aebdb50c73cd809ca63b7a6e14b1b820266c36edfb981709fb6c6051b170f1cddacd422
+  metadata.gz: 68f0092914578fb8e749e2946de66fb9a374a7d6c04006ae67de2c7caa4687fff91a63c688c9337ac9029f3536d4a1c80ca422b8489920f4bdd163788d3ff48e
+  data.tar.gz: 912872ea0c2e7e2a526282eacb6ab7723dfceaa11a1463c97f80b0841deb532c7ea73e2f289654ec12d6f46edfaaf651e665f35bda8f988a3f7d5add4f05f763

data/app/controllers/scrivito/obj_class_controller.rb

@@ -18,6 +18,8 @@ module Scrivito
       other_attributes = {}
 
       defaults.each do |name, value|
+        next if value.nil?
+
         attribute_type = obj_class.attribute_definitions[name].try(:type)
         if attribute_type == 'widgetlist'
           widgets = value.map do |new_widget|

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Fri Jun 10 08:25:50 2016
+## Certificate data from Mozilla as of: Thu Jun 16 15:05:45 2016
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/assets/javascripts/scrivito_ui.js

@@ -34278,7 +34278,7 @@ this._namespaceURI=s;var c;if(e.useCreateElement){var p,d=n._ownerDocument;if(s=
     var helper;
 
   return "<li class=\"scrivito_menu_separator scrivito_"
-    + container.escapeExpression(((helper = (helper = helpers.headline_color || (depth0 != null ? depth0.headline_color : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"headline_color","hash":{},"data":data}) : helper)))
+    + container.escapeExpression(((helper = (helper = helpers.headlineColor || (depth0 != null ? depth0.headlineColor : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"headlineColor","hash":{},"data":data}) : helper)))
     + "\">\n  <span class=\"scrivito_headline\">"
     + container.escapeExpression(((helper = (helper = helpers.headline || (depth0 != null ? depth0.headline : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"headline","hash":{},"data":data}) : helper)))
     + "</span>\n</li>\n<li class=\"scrivito_menu_separator\">\n  <span>"
@@ -35964,7 +35964,7 @@ var scrivito = {}; // jshint ignore:line
       scrivito.menu_bar_display_mode_toggle.init();
       scrivito.currentPageMenu.init();
       scrivito.menu_bar_browse_content.init();
-      scrivito.menu_bar_conflict_indicator.init();
+      scrivito.menuBarConflictIndicator.init();
       scrivito.current_page_restriction.init();
       scrivito.workspace_select.init();
       scrivito.menu_bar.init();
@@ -36057,10 +36057,15 @@ var scrivito = {}; // jshint ignore:line
   _.extend(scrivito, {
     silent_ajax: function(type, path, options) {
       var is_write_request = type === 'PUT' || type === 'POST' || type === 'DELETE';
+      var skip_write_monitor = options && options.skip_write_monitor;
+
       if (is_write_request) {
         options = options || {};
         options.timeout = 15000; // miliseconds
-        scrivito.write_monitor.start_write();
+
+        if (!skip_write_monitor) {
+          scrivito.write_monitor.start_write();
+        }
       }
 
       var ajax_promise = single_ajax(type, path, options).then(function(result) {
@@ -36071,7 +36076,7 @@ var scrivito = {}; // jshint ignore:line
         }
       });
 
-      if (is_write_request) {
+      if (is_write_request && !skip_write_monitor) {
         ajax_promise.always(function() {
           scrivito.write_monitor.end_write();
         });
@@ -38194,13 +38199,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
   })();
 
   function renewSession() {
-    return scrivito.Promise.resolve(scrivito.silent_ajax('PUT', 'sessions/' + session.id)).then(function (newSession) {
+    return requestSession().then(function (newSession) {
       sessionRenewalPromise = null;
-
       setSession(newSession);
-    }, function (error) {
+    })['catch'](function (error) {
       sessionRenewalPromise = null;
-
       throw new scrivito.UnauthorizedError('Failed to renew session.');
     });
   }
@@ -38211,6 +38214,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       sessionRenewalPromise = renewSession();
     }, (session.maxage - 10) * 1000);
   }
+
+  function requestSession() {
+    return scrivito.Promise.resolve(scrivito.silent_ajax('PUT', 'sessions/' + session.id, { skip_write_monitor: true }));
+  }
 })();
 'use strict';
 
@@ -45415,27 +45422,29 @@ var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr =
 }());
 'use strict';
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 (function () {
-  var cursor = undefined;
-  var draggedWidget = {};
-  var lastGesture = undefined;
+  var $cursor = undefined;
+  var state = {}; // State variables: gesture, widgetDrag.
 
   scrivito.dragDrool = Object.defineProperties({
     init: function init() {
-      cursor = $('<div class="scrivito_dnd_cursor"></div>');
-      cursor.hide();
-      $('body').append(cursor);
+      $cursor = $('<div class="scrivito_dnd_cursor"></div>');
+      $cursor.hide();
+      $('body').append($cursor);
 
-      scrivito.gui.on('document', function (document) {
-        var body = document.dom_element().find('body');
+      scrivito.gui.on('document', function (cmsDocument) {
+        if (scrivito.in_editable_view()) {
+          (function () {
+            var $body = cmsDocument.dom_element().find('body');
 
-        body.on('dragover', function (e) {
-          if (scrivito.in_editable_view()) {
-            scrivito.dragDrool.dragover(e, body.get(0));
-          }
-        });
+            $body.on('dragover', function (e) {
+              return scrivito.dragDrool.onDragover(e, $body);
+            });
+            $body.on('drop', function (e) {
+              return scrivito.dragDrool.onDrop(e);
+            });
+          })();
+        }
       });
 
       scrivito.on('content', function (content) {
@@ -45443,22 +45452,22 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
           var cmsDocument = scrivito.cms_document.from($(content));
 
           _.each(scrivito.widget_element.all(cmsDocument.dom_element()), function (widgetElement) {
-            var markers = widgetElement.dom_element().find('> .scrivito_editing_marker');
+            var $markers = widgetElement.dom_element().find('> .scrivito_editing_marker');
 
-            markers.attr('draggable', 'true');
+            $markers.attr('draggable', 'true');
 
-            markers.on('dragstart', function (e) {
-              return scrivito.dragDrool.dragstart(e);
+            $markers.on('dragstart', function (e) {
+              return scrivito.dragDrool.onDragstart(e);
             });
-            markers.on('dragend', function (e) {
-              return scrivito.dragDrool.dragend(e);
+            $markers.on('dragend', function (e) {
+              return scrivito.dragDrool.onDragend(e);
             });
           });
         }
       });
     },
 
-    dragstart: function dragstart(e) {
+    onDragstart: function onDragstart(e) {
       e.originalEvent.dataTransfer.effectAllowed = 'move';
 
       // Is required in order to dragover event is triggered in FF and Safari.
@@ -45470,12 +45479,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         // Ignore.
       }
 
-      draggedWidget.HTMLNode = $(e.originalEvent.target).parent()[0];
-      draggedWidget.isHidden = false;
+      var $draggedWidget = $(e.originalEvent.target).parent();
+      var widgetDrag = new scrivito.WidgetDrag($draggedWidget);
+      this.setState({ widgetDrag: widgetDrag });
     },
 
-    dragover: scrivito.oncePerFrame(function (e, body) {
-      if (!draggedWidget.HTMLNode) {
+    onDragover: function onDragover(e, $body) {
+      if (!scrivito.dragDrool.buildDrag(e)) {
         return;
       }
 
@@ -45484,22 +45494,32 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         e.preventDefault(); // Necessary: Allows us to drop.
       }
 
-      // Replace original with placeholder.
-      if (!draggedWidget.isHidden) {
-        // jQuery's "css" function does not work correctly in a Chrome + Jasmine environment,
-        // so we need to use the low-level accessors in order to test the behavior.
-        draggedWidget.HTMLNode.style.opacity = '0.5';
-        draggedWidget.isHidden = true;
-      }
-
       // Using originalEvent as a workaround.
       // See https://github.com/jquery/jquery/issues/1925.
       var mouse = { x: e.originalEvent.pageX, y: e.originalEvent.pageY };
-      var gesture = scrivito.detectGesture(mouse, $(body), draggedWidget.HTMLNode);
-      var target = $(gesture.target);
+
+      this._updateCursorDebounced(mouse, $body, e);
+    },
+
+    _updateCursorDebounced: scrivito.oncePerFrame(function () {
+      var _scrivito$dragDrool;
+
+      (_scrivito$dragDrool = scrivito.dragDrool)._updateCursor.apply(_scrivito$dragDrool, arguments);
+    }),
+
+    _updateCursor: function _updateCursor(mouse, $body, e) {
+      var drag = scrivito.dragDrool.buildDrag(e);
+      if (!drag) {
+        return;
+      }
+
+      drag.onDragover();
+
+      var gesture = scrivito.detectGesture(mouse, $body, drag.domElement);
+      var $target = $(gesture.target);
 
       // This should NEVER happen!
-      if (!target.length) {
+      if (!$target.length) {
         scrivito.logError('Missing target!');
         return;
       }
@@ -45507,334 +45527,167 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       var edgeName = gesture.edgeName;
 
       if (edgeName === 'top' || edgeName === 'bottom') {
-        scrivito.dragDrool.showRowCursor(edgeName, target);
+        scrivito.dragDrool.showRowCursor(edgeName, $target, drag);
       } else if (edgeName === 'left' || edgeName === 'right') {
-        scrivito.dragDrool.showColCursor(edgeName, target, gesture.isWrapFree);
+        scrivito.dragDrool.showColCursor(edgeName, $target, drag, gesture.isWrapFree);
       } else {
         // This should NEVER happen!
         $.error('Unknown gesture: ' + gesture);
       }
 
-      lastGesture = gesture;
-    }),
+      scrivito.dragDrool.setState({ gesture: gesture });
+    },
 
-    dragend: function dragend() {
-      var gesture = lastGesture;
+    onDrop: function onDrop(e) {
+      var drag = this.buildDrag(e);
+      var gesture = this.state.gesture;
 
-      if (!gesture || !gesture.target || !isValidTarget(gesture.target) || gesture.target.get(0) === draggedWidget.HTMLNode) {
-        // Widget class not allowed to drop here: Do nothing.
-        // Dragged a widget on itself: Do nothing.
-        draggedWidget.HTMLNode.style.opacity = 1;
+      if (!gesture || !gesture.target || !drag.canDropInto(gesture.target)) {
+        drag.onCancel();
       } else if (gesture.target) {
-        var target = gesture.target;
-        var oldParent = $(draggedWidget.HTMLNode).parent();
-        var edgeName = gesture.edgeName;
-
-        if (edgeName === 'top' || edgeName === 'bottom') {
-          scrivito.dragDrool.insertRow(target, edgeName, oldParent);
-        } else {
-          scrivito.dragDrool.insertCol(target, edgeName, oldParent);
-        }
+        drag.dropInto(gesture.target, gesture.edgeName);
       }
 
-      cursor.hide();
-      draggedWidget = {};
+      this._cleanup();
       return false;
     },
 
-    showRowCursor: function showRowCursor(edgeName, target) {
-      cursor.height('0px');
-      cursor.width(target.parent().outerWidth());
+    onDragend: function onDragend(e) {
+      var drag = this.buildDrag(e);
+      if (drag) {
+        drag.onCancel();
+      }
+
+      this._cleanup();
+    },
+
+    showRowCursor: function showRowCursor(edgeName, $target, drag) {
+      $cursor.height('0px');
+      $cursor.width($target.parent().outerWidth());
 
       // TODO: Update cursor position on scroll.
-      var offset = scrivito.cms_document.offset(target);
+      var offset = scrivito.cms_document.offset($target);
 
       if (edgeName === 'top') {
-        var prevRow = target.prev();
-        if (prevRow.length) {
-          var prevRowOffset = scrivito.cms_document.offset(prevRow);
-          offset.top = offsetCenter(prevRow, prevRowOffset, target, offset).top;
+        var $prevRow = $target.prev();
+        if ($prevRow.length) {
+          var prevRowOffset = scrivito.cms_document.offset($prevRow);
+          offset.top = offsetCenter($prevRow, prevRowOffset, offset).top;
         }
       } else {
-        var nextRow = target.next();
-        if (nextRow.length) {
-          var nextRowOffset = scrivito.cms_document.offset(nextRow);
-          offset.top = offsetCenter(target, offset, nextRow, nextRowOffset).top;
+        var $nextRow = $target.next();
+        if ($nextRow.length) {
+          var nextRowOffset = scrivito.cms_document.offset($nextRow);
+          offset.top = offsetCenter($target, offset, nextRowOffset).top;
         } else {
-          offset.top += target.outerHeight();
+          offset.top += $target.outerHeight();
         }
       }
 
-      offset.left = scrivito.cms_document.offset(target.parent()).left;
-      cursor.offset(offset);
-
-      if (isValidTarget(target)) {
-        cursor.removeClass('scrivito_dnd_forbidden');
-      } else {
-        cursor.addClass('scrivito_dnd_forbidden');
-      }
+      offset.left = scrivito.cms_document.offset($target.parent()).left;
+      $cursor.offset(offset);
 
-      showCursor(target);
+      showCursor($target, drag);
     },
 
-    showColCursor: function showColCursor(edgeName, target, isWrapFree) {
+    showColCursor: function showColCursor(edgeName, $target, drag, isWrapFree) {
       if (!scrivito.enableColDragDrool) {
         return;
       }
 
-      cursor.height(target.outerHeight());
-      cursor.width('0px');
+      $cursor.height($target.outerHeight());
+      $cursor.width('0px');
 
       // TODO: Update cursor position on scroll.
-      var offset = scrivito.cms_document.offset(target);
+      var offset = scrivito.cms_document.offset($target);
 
       if (edgeName === 'left') {
-        var prevCol = target.prev();
-        if (prevCol.length && isWrapFree) {
-          var documentOffset = scrivito.cms_document.offset(prevCol);
-          offset.left = offsetCenter(prevCol, documentOffset, target, offset).left;
-          cursor.height(target.parent().outerHeight());
+        var $prevCol = $target.prev();
+        if ($prevCol.length && isWrapFree) {
+          var documentOffset = scrivito.cms_document.offset($prevCol);
+          offset.left = offsetCenter($prevCol, documentOffset, offset).left;
+          $cursor.height($target.parent().outerHeight());
         }
       } else {
-        var nextCol = target.next();
-        if (nextCol.length && isWrapFree) {
-          var documentOffset = scrivito.cms_document.offset(nextCol);
-          offset.left = offsetCenter(target, offset, nextCol, documentOffset).left;
-          cursor.height(target.parent().outerHeight());
+        var $nextCol = $target.next();
+        if ($nextCol.length && isWrapFree) {
+          var documentOffset = scrivito.cms_document.offset($nextCol);
+          offset.left = offsetCenter($target, offset, documentOffset).left;
+          $cursor.height($target.parent().outerHeight());
         } else {
-          offset.left += target.outerWidth();
+          offset.left += $target.outerWidth();
         }
       }
 
-      cursor.offset(offset);
-      showCursor(target);
+      $cursor.offset(offset);
+      showCursor($target, drag);
     },
 
-    insertRow: function insertRow(target, edgeName, oldParent) {
-      $(draggedWidget.HTMLNode).hide();
-
-      if (target.is('[data-scrivito-field-type=widgetlist]')) {
-        target.append(draggedWidget.HTMLNode);
-      } else {
-        target[edgeName === 'top' ? 'before' : 'after'](draggedWidget.HTMLNode);
-      }
-
-      draggedWidget.HTMLNode.style.opacity = 1;
-      $(draggedWidget.HTMLNode).slideDown(100);
-
-      if (scrivito.enableColDragDrool) {
-        garbageCollect(oldParent);
-      }
-
-      scrivito.dragDrool.save(oldParent);
+    // Public for test purpose only.
+    buildDrag: function buildDrag(e) {
+      return this.state.widgetDrag;
     },
 
-    insertCol: function insertCol(target, edgeName, oldParent) {
-      if (!scrivito.enableColDragDrool) {
-        draggedWidget.HTMLNode.style.opacity = 1;
-        return;
-      }
-
-      var actualTarget = target;
-      var insertAtObjClass = actualTarget.attr('data-scrivito-widget-obj-class');
-
-      if (insertAtObjClass !== 'ColumnWidget') {
-        actualTarget.wrap('<div class="row" data-scrivito-widget-obj-class=ColumnContainerWidget>' + '<div class="col-md-12" data-scrivito-widget-obj-class=ColumnWidget></div>' + '</div>');
-        actualTarget = target.parent();
-      }
-
-      $(draggedWidget.HTMLNode).detach();
-      $(draggedWidget.HTMLNode).wrap('<div class="col-md-12" data-scrivito-widget-obj-class=ColumnWidget></div>');
-
-      var insertionMethod = edgeName === 'left' ? 'before' : 'after';
-      actualTarget[insertionMethod]($(draggedWidget.HTMLNode).parent());
-
-      $(draggedWidget.HTMLNode).css('opacity', '1');
-      $(draggedWidget.HTMLNode).show(100);
-
-      garbageCollect(oldParent);
-
-      resizeRow(actualTarget.closest('.row'));
+    setState: function setState(newState) {
+      state = _.extend(state, newState);
     },
 
-    save: function save($sourceField) {
-      var $draggedWidget = $(draggedWidget.HTMLNode);
-
-      var widgetElement = scrivito.cms_element.from_dom_element($draggedWidget);
-      var sourceField = scrivito.cms_element.from_dom_element($sourceField);
-      var targetField = scrivito.cms_element.from_dom_element($draggedWidget.parent());
-
-      scrivito.widgetlistFieldPlaceholder.update(sourceField);
-      scrivito.widgetlistFieldPlaceholder.update(targetField);
-
-      updateModelFor(sourceField);
-      updateModelFor(targetField);
-
-      if (!widgetElement.dom_element().is(targetField.inner_tag())) {
-        scrivito.widget_reloading.reload_widget(widgetElement);
+    // For test purpose only.
+    reset: function reset() {
+      if ($cursor) {
+        $cursor.remove();
       }
+
+      state = {};
     },
 
-    // For test purpose only.
-    cleanup: function cleanup() {
-      draggedWidget = {};
-      $('.scrivito_dnd_cursor').remove();
+    _cleanup: function _cleanup() {
+      $cursor.hide();
+      this.setState({ widgetDrag: null });
     }
   }, {
-    draggedWidget: { // For test purpose only.
-
-      get: function get() {
-        return draggedWidget;
-      },
-      configurable: true,
-      enumerable: true
-    },
-    lastGesture: {
-
-      // For test purpose only.
-
+    state: {
       get: function get() {
-        return lastGesture;
-      },
-
-      // For test purpose only.
-      set: function set(newGesture) {
-        lastGesture = newGesture;
+        return state;
       },
       configurable: true,
       enumerable: true
     }
   });
 
-  var changeColClass = function changeColClass(elem, newClass) {
-    var animation = arguments.length <= 2 || arguments[2] === undefined ? 100 : arguments[2];
-
-    var isOldClassFound = undefined;
-
-    _.each(_.range(1, 13), function (i) {
-      var oldClass = 'col-md-' + i;
-      if ($(elem).hasClass(oldClass)) {
-        isOldClassFound = true;
-        if (oldClass !== newClass) {
-          $(elem).switchClass(oldClass, newClass, animation);
-        }
-      }
-    });
-
-    if (!isOldClassFound) {
-      $(elem).addClass(newClass, animation);
+  function showCursor($target, drag) {
+    if (drag.canDropInto($target)) {
+      $cursor.removeClass('scrivito_dnd_forbidden');
+    } else {
+      $cursor.addClass('scrivito_dnd_forbidden');
     }
-  };
 
-  var resizeRow = function resizeRow(row) {
-    var $row = $(row);
-    var cols = $row.children().toArray();
-    var space = 12;
-
-    while (cols.length > 0) {
-      var size = Math.round(space / cols.length);
-      space -= size;
-      var col = cols.shift();
-      changeColClass(col, 'col-md-' + size, 100);
+    if (drag.isStructureWidget()) {
+      $cursor.addClass('scrivito_dnd_structure');
+    } else {
+      $cursor.removeClass('scrivito_dnd_structure');
     }
-  };
-
-  var garbageCollect = function garbageCollect(elem) {
-    if ($(elem).attr('data-scrivito-widget-obj-class') === 'ColumnWidget') {
-      if ($(elem).children().length === 0) {
-        // remove empty column
-        var container = $(elem).parent();
-        elem.remove();
 
-        var leftoverCols = $(container).children();
-        if (leftoverCols.length > 1) {
-          resizeRow(container);
-        } else {
-          // unwrap last column
-          var lastCol = leftoverCols[0];
-          var widgetsToUnwrap = $(lastCol).children();
-
-          if (widgetsToUnwrap.length === 0) {
-            // last column is empty.
-            // this should never happen, but better safe than sorry...
-            $(container).remove();
-          } else {
-            // remove column widget
-            $(widgetsToUnwrap).unwrap();
-
-            // remove column container widget
-            $(widgetsToUnwrap).unwrap();
-          }
-        }
-      } else {
-        var childWidgets = $(elem).children();
-        if (childWidgets.length === 1) {
-          var lonelyChildWidget = childWidgets.eq(0);
-          if (lonelyChildWidget.is('[data-scrivito-widget-obj-class=ColumnContainerWidget]')) {
-            var colsToUnwrap = lonelyChildWidget.children();
-            if (colsToUnwrap.length) {
-              $(elem).replaceWith(colsToUnwrap);
-            }
-          }
-        }
-      }
+    if ($target.hasClass('scrivito_empty_widget_field')) {
+      $cursor.height($target.height());
     }
-  };
 
-  var offsetCenter = function offsetCenter(element, elementOffset, nextElem, nextElemOffset) {
-    var leftBoundary = elementOffset.left + element.outerWidth();
+    $cursor.show();
+  }
+
+  function offsetCenter($element, elementOffset, nextElemOffset) {
+    var leftBoundary = elementOffset.left + $element.outerWidth();
     var rightBoundary = nextElemOffset.left;
     var horizOffset = (rightBoundary - leftBoundary) / 2;
     var left = leftBoundary + horizOffset;
 
-    var topBoundary = elementOffset.top + element.outerHeight();
+    var topBoundary = elementOffset.top + $element.outerHeight();
     var bottomBoundary = nextElemOffset.top;
     var vertOffset = (bottomBoundary - topBoundary) / 2;
     var top = topBoundary + vertOffset;
 
     return { left: left, top: top };
-  };
-
-  var updateModelFor = function updateModelFor(fieldElement) {
-    var container = fieldElement.container();
-    var newWidgets = widgetIdsToWidgets(container, fieldElement.content());
-    container.update(_defineProperty({}, fieldElement.field_name(), newWidgets));
-  };
-
-  var widgetIdsToWidgets = function widgetIdsToWidgets(objOrWidget, ids) {
-    return _.map(ids, function (widgetId) {
-      return objOrWidget.widget(widgetId);
-    });
-  };
-
-  var isValidTarget = function isValidTarget(target) {
-    var targetElement = scrivito.cms_element.from_dom_element(target);
-    if (targetElement.widget_field) {
-      targetElement = targetElement.widget_field();
-    }
-
-    var draggedElement = scrivito.cms_element.from_dom_element($(draggedWidget.HTMLNode));
-
-    return targetElement.is_valid_child_class(draggedElement.widget().widget_class_name());
-  };
-
-  var showCursor = function showCursor(target) {
-    if ($(draggedWidget.HTMLNode).is('[data-scrivito-private-structure-widget]')) {
-      cursor.addClass('scrivito_dnd_structure');
-    } else {
-      cursor.removeClass('scrivito_dnd_structure');
-    }
-
-    if (target.hasClass('scrivito_empty_widget_field')) {
-      showBoxCursor(target);
-    }
-
-    cursor.show();
-  };
-
-  var showBoxCursor = function showBoxCursor(target) {
-    cursor.height(target.height());
-  };
+  }
 })();
 'use strict';
 
@@ -45903,7 +45756,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         view.find(".scrivito_input_new_ws_name label, .scrivito_input_new_ws_name input").addClass("scrivito_disabled");
       });
 
-      view.on('focus click drop', '.scrivito_input_new_ws_name', function(e) {
+      view.on('focus click', '.scrivito_input_new_ws_name', function(e) {
         create_new_ws = true;
         view.find(".scrivito_confirm").html(scrivito.t('menu_bar.create'));
         view.find(".scrivito_disabled").removeClass("scrivito_disabled");
@@ -46366,74 +46219,81 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     }
   });
 }());
-(function() {
-  var render, current_page;
+'use strict';
 
-  _.extend(scrivito, {
-    menu_bar_conflict_indicator: {
-      init: function() {
-        scrivito.menu_bar.register_item_renderer(function(menu_bar) {
-          render = function(color, commands) {
-            var target = $(scrivito.template.render('menu_bar_conflict_indicator'))
-              .appendTo(menu_bar.find('#scrivito_menu_bar_conflict_indicator'));
-            target.show();
-            target.find('.scrivito_icon').addClass('scrivito_'+color);
-            target.on('click', function() {
-              scrivito.context_menu.toggle(target, commands, {css_class: 'conflict_indicator'});
-            });
-          };
+function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i]; return arr2; } else { return Array.from(arr); } }
 
-          current_page = scrivito.application_document().page();
-          if (current_page) {
-            check_conflict(function() {
-              check_potential_conflicts();
-            });
-          }
-        });
-      }
+(function () {
+  var render = undefined;
+  var currentPage = undefined;
+
+  scrivito.menuBarConflictIndicator = {
+    init: function init() {
+      scrivito.menu_bar.register_item_renderer(function (menuBar) {
+        render = function (color, commands) {
+          var target = $(scrivito.template.render('menu_bar_conflict_indicator'));
+
+          target.appendTo(menuBar.find('#scrivito_menu_bar_conflict_indicator'));
+          target.show();
+          target.find('.scrivito_icon').addClass('scrivito_' + color);
+
+          target.on('click', function () {
+            scrivito.context_menu.toggle(target, commands, { css_class: 'conflict_indicator' });
+          });
+        };
+
+        currentPage = scrivito.application_document().page();
+        if (currentPage && scrivito.editing_context.selected_workspace.is_editable()) {
+          checkConflict(checkPotentialConflicts);
+        }
+      });
     }
-  });
+  };
 
-  var check_conflict = function(next) {
-    if (current_page.has_conflict()) {
-      render_conflict();
+  function checkConflict(next) {
+    if (currentPage.has_conflict()) {
+      renderConflict();
     } else {
       next();
     }
-  };
+  }
 
-  var check_potential_conflicts = function() {
-    current_page.conflicting_workspaces().done(function(workspaces) {
+  function checkPotentialConflicts() {
+    currentPage.conflicting_workspaces().done(function (workspaces) {
       if (workspaces.length) {
-        render_potential_conflicts(workspaces);
+        renderPotentialConflict(workspaces);
       }
     });
-  };
+  }
 
-  var render_conflict = function() {
+  function renderConflict() {
     render('red', [{
-      id: function() { return 'scrivito.menu_bar_conflict_indicator.header'; },
-      render: function() {
+      id: function id() {
+        return 'scrivito.menu_bar_conflict_indicator.header';
+      },
+
+      render: function render() {
         return scrivito.template.render('menu_bar_conflict_indicator/conflict');
       }
     }]);
-  };
+  }
 
-  var render_potential_conflicts = function(workspaces) {
+  function renderPotentialConflict(workspaces) {
     render('yellow', [{
-      id: function() { return 'scrivito.menu_bar_conflict_indicator.header'; },
-      render: function() {
+      id: function id() {
+        return 'scrivito.menu_bar_conflict_indicator.header';
+      },
+
+      render: function render() {
         return scrivito.template.render('menu_bar_conflict_indicator/warn', {
-          headline_color: 'yellow',
+          headlineColor: 'yellow',
           headline: scrivito.t('menu_bar_conflict_indicator.warn_headline'),
           description: scrivito.t('menu_bar_conflict_indicator.warn_description')
         });
       }
-    }].concat(_.map(workspaces, function(ws) {
-      return scrivito.select_workspace_command(ws);
-    })));
-  };
-}());
+    }].concat(_toConsumableArray(_.map(workspaces, scrivito.select_workspace_command))));
+  }
+})();
 (function() {
   _.extend(scrivito, {
     menu_bar_device_toggle: {
@@ -47269,6 +47129,262 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     }
   });
 })();
+'use strict';
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
+
+(function () {
+  scrivito.WidgetDrag = (function () {
+    function WidgetDrag(object) {
+      _classCallCheck(this, WidgetDrag);
+
+      if (object instanceof jQuery) {
+        this._domElement = object.get(0);
+        this._$domElement = object;
+      } else {
+        this._domElement = object;
+        this._$domElement = $(object);
+      }
+
+      this._isHidden = false;
+    }
+
+    _createClass(WidgetDrag, [{
+      key: 'isHidden',
+
+      // For test purpose only.
+      value: function isHidden() {
+        return this._isHidden;
+      }
+    }, {
+      key: 'canDropInto',
+      value: function canDropInto($target) {
+        if (scrivito.enableColDragDrool) {
+          return true;
+        }
+
+        var targetElement = scrivito.cms_element.from_dom_element($target);
+        if (targetElement.widget_field) {
+          targetElement = targetElement.widget_field();
+        }
+
+        var draggedElement = scrivito.cms_element.from_dom_element(this._$domElement);
+        return targetElement.is_valid_child_class(draggedElement.widget().widget_class_name());
+      }
+    }, {
+      key: 'isStructureWidget',
+      value: function isStructureWidget() {
+        return this._$domElement.is('[data-scrivito-private-structure-widget]');
+      }
+    }, {
+      key: 'onDragover',
+      value: function onDragover() {
+        if (!this._isHidden) {
+          // jQuery's "css" function does not work correctly in a Chrome + Jasmine environment,
+          // so we need to use the low-level accessors in order to test the behavior.
+          this._domElement.style.opacity = '0.5';
+          this._isHidden = true;
+        }
+      }
+    }, {
+      key: 'dropInto',
+      value: function dropInto($target, edgeName) {
+        // Dropped the widget back.
+        if ($target.is(this._$domElement)) {
+          return this.onCancel();
+        }
+
+        if (edgeName === 'top' || edgeName === 'bottom') {
+          var $sourceList = this._$domElement.parent();
+          this.insertRow($target, edgeName);
+
+          var $targetList = this._$domElement.parent();
+          this.save($sourceList, $targetList);
+        } else {
+          if (scrivito.enableColDragDrool) {
+            this.insertCol($target, edgeName);
+          } else {
+            this.onCancel();
+          }
+        }
+      }
+
+      // Public only for test purpose.
+    }, {
+      key: 'insertRow',
+      value: function insertRow($target, edgeName) {
+        var $sourceList = this._$domElement.parent();
+
+        this._$domElement.hide();
+
+        if ($target.is('[data-scrivito-field-type=widgetlist]')) {
+          $target.append(this._$domElement);
+        } else {
+          $target[edgeName === 'top' ? 'before' : 'after'](this._$domElement);
+        }
+
+        this._domElement.style.opacity = 1;
+        this._$domElement.slideDown(100);
+
+        if (scrivito.enableColDragDrool) {
+          this._garbageCollect($sourceList);
+        }
+      }
+
+      // Public only for test purpose.
+    }, {
+      key: 'insertCol',
+      value: function insertCol($target, edgeName) {
+        var $sourceList = this._$domElement.parent();
+
+        var $actualTarget = $target;
+        var insertAtObjClass = $actualTarget.attr('data-scrivito-widget-obj-class');
+
+        if (insertAtObjClass !== 'ColumnWidget') {
+          $actualTarget.wrap('<div class="row" data-scrivito-widget-obj-class=ColumnContainerWidget>' + '<div class="col-md-12" data-scrivito-widget-obj-class=ColumnWidget></div>' + '</div>');
+          $actualTarget = $target.parent();
+        }
+
+        this._$domElement.detach();
+        this._$domElement.wrap('<div class="col-md-12" data-scrivito-widget-obj-class=ColumnWidget></div>');
+
+        var insertionMethod = edgeName === 'left' ? 'before' : 'after';
+        $actualTarget[insertionMethod](this._$domElement.parent());
+
+        this._$domElement.css('opacity', '1');
+        this._$domElement.show(100);
+
+        this._garbageCollect($sourceList);
+        this._resizeRow($actualTarget.closest('.row'));
+      }
+
+      // Public only for test purpose.
+    }, {
+      key: 'save',
+      value: function save($source, $target) {
+        if (scrivito.enableColDragDrool) {
+          return;
+        }
+
+        var sourceField = scrivito.cms_element.from_dom_element($source);
+        var targetField = scrivito.cms_element.from_dom_element($target);
+
+        scrivito.widgetlistFieldPlaceholder.update(sourceField);
+        scrivito.widgetlistFieldPlaceholder.update(targetField);
+
+        this._updateModelFor(sourceField);
+        this._updateModelFor(targetField);
+
+        var widgetElement = scrivito.cms_element.from_dom_element(this._$domElement);
+        if (!widgetElement.dom_element().is(targetField.inner_tag())) {
+          scrivito.widget_reloading.reload_widget(widgetElement);
+        }
+      }
+    }, {
+      key: 'onCancel',
+      value: function onCancel() {
+        this._domElement.style.opacity = 1;
+      }
+    }, {
+      key: '_resizeRow',
+      value: function _resizeRow($row) {
+        var cols = $row.children().toArray();
+        var space = 12;
+
+        while (cols.length > 0) {
+          var size = Math.round(space / cols.length);
+          space -= size;
+          var col = cols.shift();
+          this._changeColClass($(col), 'col-md-' + size, 100);
+        }
+      }
+    }, {
+      key: '_garbageCollect',
+      value: function _garbageCollect($elem) {
+        if ($elem.attr('data-scrivito-widget-obj-class') === 'ColumnWidget') {
+          if ($elem.children().length === 0) {
+            // remove empty column
+            var $container = $elem.parent();
+            $elem.remove();
+
+            var $leftoverCols = $container.children();
+            if ($leftoverCols.length > 1) {
+              this._resizeRow($container);
+            } else {
+              // unwrap last column
+              var $lastCol = $leftoverCols.eq(0);
+              var $widgetsToUnwrap = $lastCol.children();
+
+              if ($widgetsToUnwrap.length === 0) {
+                // last column is empty.
+                // this should never happen, but better safe than sorry...
+                $container.remove();
+              } else {
+                // remove column widget
+                $widgetsToUnwrap.unwrap();
+
+                // remove column container widget
+                $widgetsToUnwrap.unwrap();
+              }
+            }
+          } else {
+            var $childWidgets = $elem.children();
+            if ($childWidgets.length === 1) {
+              var $lonelyChildWidget = $childWidgets.eq(0);
+              if ($lonelyChildWidget.is('[data-scrivito-widget-obj-class=ColumnContainerWidget]')) {
+                var $colsToUnwrap = $lonelyChildWidget.children();
+                if ($colsToUnwrap.length) {
+                  $elem.replaceWith($colsToUnwrap);
+                }
+              }
+            }
+          }
+        }
+      }
+    }, {
+      key: '_changeColClass',
+      value: function _changeColClass($col, newClass) {
+        var animation = arguments.length <= 2 || arguments[2] === undefined ? 100 : arguments[2];
+
+        var isOldClassFound = undefined;
+
+        _.each(_.range(1, 13), function (i) {
+          var oldClass = 'col-md-' + i;
+          if ($col.hasClass(oldClass)) {
+            isOldClassFound = true;
+            if (oldClass !== newClass) {
+              $col.switchClass(oldClass, newClass, animation);
+            }
+          }
+        });
+
+        if (!isOldClassFound) {
+          $col.addClass(newClass, animation);
+        }
+      }
+    }, {
+      key: '_updateModelFor',
+      value: function _updateModelFor(fieldElement) {
+        var container = fieldElement.container();
+        var widgets = _.map(fieldElement.content(), function (id) {
+          return container.widget(id);
+        });
+        container.update(_defineProperty({}, fieldElement.field_name(), widgets));
+      }
+    }, {
+      key: 'domElement',
+      get: function get() {
+        return this._domElement;
+      }
+    }]);
+
+    return WidgetDrag;
+  })();
+})();
 (function() {
   _.extend(scrivito, {
     widget_marker: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc1
+  version: 1.4.0.rc2
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable