Skip to content

Commit 348f8df

Browse files
committed
re-generate all dist/ files (yarn build) with latest fixes
1 parent 805e566 commit 348f8df

File tree

7 files changed

+14
-17
lines changed

7 files changed

+14
-17
lines changed

dist/gridstack-extra.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/gridstack.all.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/gridstack.jQueryUI.min.js

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/gridstack.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@
252252
var newY = n.y;
253253
while (newY >= n._origY) {
254254
var collisionNode = _.chain(this.nodes)
255+
.take(i)
255256
.find(_.bind(Utils._didCollide, {n: n, newY: newY}))
256257
.value();
257258

@@ -798,13 +799,14 @@
798799
var onDrag = function(event, ui) {
799800
var el = draggingElement;
800801
var node = el.data('_gridstack_node');
801-
var pos = self.getCellFromPixel(ui.offset, true);
802+
var pos = self.getCellFromPixel({left: event.pageX, top: event.pageY}, true);
802803
var x = Math.max(0, pos.x);
803804
var y = Math.max(0, pos.y);
804805
if (!node._added) {
805806
node._added = true;
806807

807808
node.el = el;
809+
node.autoPosition = true;
808810
node.x = x;
809811
node.y = y;
810812
self.grid.cleanNodes();
@@ -823,13 +825,12 @@
823825
node._beforeDragY = node.y;
824826

825827
self._updateContainerHeight();
826-
} else {
827-
if (!self.grid.canMoveNode(node, x, y)) {
828-
return;
829-
}
830-
self.grid.moveNode(node, x, y);
831-
self._updateContainerHeight();
832828
}
829+
if (!self.grid.canMoveNode(node, x, y)) {
830+
return;
831+
}
832+
self.grid.moveNode(node, x, y);
833+
self._updateContainerHeight();
833834
};
834835

835836
this.dd

dist/gridstack.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/gridstack.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/gridstack.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)