Merge pull request #767 from radiolips/bugfix/628

Bugfix/628
gridstack · Sep 9, 2017 · 961eafe · 961eafe
2 parents f39cf22 + e12b460
commit 961eafe
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 21 deletions.
diff --git a/dist/gridstack-extra.min.css b/dist/gridstack-extra.min.css
diff --git a/dist/gridstack.all.js b/dist/gridstack.all.js
diff --git a/dist/gridstack.jQueryUI.min.js b/dist/gridstack.jQueryUI.min.js
diff --git a/dist/gridstack.js b/dist/gridstack.js
@@ -106,6 +106,25 @@
                 height = parseFloat(match[1]);
             }
             return {height: height, unit: heightUnit};
+        },
+
+        removePositioningStyles: function(el) {
+            var style = el[0].style;
+            if (style.position) {
+                style.removeProperty('position');
+            }
+            if (style.left) {
+                style.removeProperty('left');
+            }
+            if (style.top) {
+                style.removeProperty('top');
+            }
+            if (style.width) {
+                style.removeProperty('width');
+            }
+            if (style.height) {
+                style.removeProperty('height');
+            }
         }
     };
 
@@ -869,13 +888,14 @@
                     $(ui.helper).remove();
                     node.el = el;
                     self.placeholder.hide();
+                    Utils.removePositioningStyles(el);
+
                     el
                         .attr('data-gs-x', node.x)
                         .attr('data-gs-y', node.y)
                         .attr('data-gs-width', node.width)
                         .attr('data-gs-height', node.height)
                         .addClass(self.opts.itemClass)
-                        .removeAttr('style')
                         .enableSelection()
                         .removeData('draggable')
                         .removeClass('ui-draggable ui-draggable-dragging ui-draggable-disabled')
@@ -947,14 +967,14 @@
         if (typeof maxHeight == 'undefined') {
             maxHeight = this._styles._max;
         }
+        if (this._styles._max !== 0 && maxHeight <= this._styles._max) { // Keep this._styles._max increasing
+            return ;
+        }
         this._initStyles();
         this._updateContainerHeight();
         if (!this.opts.cellHeight) { // The rest will be handled by CSS
             return ;
         }
-        if (this._styles._max !== 0 && maxHeight <= this._styles._max) {
-            return ;
-        }
 
         if (!this.opts.verticalMargin || this.opts.cellHeightUnit === this.opts.verticalMarginUnit) {
             getHeight = function(nbRows, nbMargins) {
@@ -1008,6 +1028,10 @@
             return;
         }
         var height = this.grid.getGridHeight();
+        var minHeight = parseInt(this.container.css('min-height')) / this.cellHeight();
+        if (height < minHeight) {
+            height = minHeight;
+        }
         this.container.attr('data-gs-current-height', height);
         if (!this.opts.cellHeight) {
             return ;
@@ -1170,19 +1194,19 @@
             } else {
                 self._clearRemovingTimeout(el);
                 if (!node._temporaryRemoved) {
+                    Utils.removePositioningStyles(o);
                     o
                         .attr('data-gs-x', node.x)
                         .attr('data-gs-y', node.y)
                         .attr('data-gs-width', node.width)
-                        .attr('data-gs-height', node.height)
-                        .removeAttr('style');
+                        .attr('data-gs-height', node.height);
                 } else {
+                    Utils.removePositioningStyles(o);
                     o
                         .attr('data-gs-x', node._beforeDragX)
                         .attr('data-gs-y', node._beforeDragY)
                         .attr('data-gs-width', node.width)
-                        .attr('data-gs-height', node.height)
-                        .removeAttr('style');
+                        .attr('data-gs-height', node.height);
                     node.x = node._beforeDragX;
                     node.y = node._beforeDragY;
                     self.grid.addNode(node);

diff --git a/dist/gridstack.min.css b/dist/gridstack.min.css
diff --git a/dist/gridstack.min.js b/dist/gridstack.min.js
diff --git a/dist/gridstack.min.map b/dist/gridstack.min.map
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -23,6 +23,9 @@ Change log
 - widgets can have their own resize handles. Use `data-gs-resize-handles` element attribute to use. For example, `data-gs-resize-handles="e,w"` will make the particular widget only resize west and east. ([#494](https://github.com/troolee/gridstack.js/issues/494)).
 - enable sidebar items to be duplicated properly. Pass `helper: 'clone'` in `draggable` options. ([#661](https://github.com/troolee/gridstack.js/issues/661), ([#396](https://github.com/troolee/gridstack.js/issues/396), ([#499](https://github.com/troolee/gridstack.js/issues/499)).
 - fix `staticGrid` grid option ([#743](https://github.com/troolee/gridstack.js/issues/743))
+- preserve inline styles when moving/cloning items (thanks silverwind)
+- fix bug causing heights not to get set ([#744](https://github.com/troolee/gridstack.js/issues/744))
+- allow grid to have min-height, fixes ([#628](https://github.com/troolee/gridstack.js/issues/628))
 
 ## v0.3.0 (2017-04-21)
 

diff --git a/src/gridstack.js b/src/gridstack.js
@@ -109,10 +109,22 @@
         },
 
         removePositioningStyles: function(el) {
-          var style = el[0].style;
-          if (style.position) style.removeProperty('position');
-          if (style.left) style.removeProperty('left');
-          if (style.top) style.removeProperty('top');
+            var style = el[0].style;
+            if (style.position) {
+                style.removeProperty('position');
+            }
+            if (style.left) {
+                style.removeProperty('left');
+            }
+            if (style.top) {
+                style.removeProperty('top');
+            }
+            if (style.width) {
+                style.removeProperty('width');
+            }
+            if (style.height) {
+                style.removeProperty('height');
+            }
         }
     };
 
@@ -1016,6 +1028,10 @@
             return;
         }
         var height = this.grid.getGridHeight();
+        var minHeight = parseInt(this.container.css('min-height')) / this.cellHeight();
+        if (height < minHeight) {
+            height = minHeight;
+        }
         this.container.attr('data-gs-current-height', height);
         if (!this.opts.cellHeight) {
             return ;