Skip to content

Commit

Permalink
Merge pull request #434 from aletorrado/master
Browse files Browse the repository at this point in the history
Some fixes when dropping external items.
  • Loading branch information
radiolips committed Sep 11, 2017
2 parents 961eafe + 5e71f4b commit 152cbd9
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/gridstack.js
Original file line number Diff line number Diff line change
Expand Up @@ -798,13 +798,14 @@
var onDrag = function(event, ui) {
var el = draggingElement;
var node = el.data('_gridstack_node');
var pos = self.getCellFromPixel(ui.offset, true);
var pos = self.getCellFromPixel({left: event.pageX, top: event.pageY}, true);
var x = Math.max(0, pos.x);
var y = Math.max(0, pos.y);
if (!node._added) {
node._added = true;

node.el = el;
node.autoPosition = true;
node.x = x;
node.y = y;
self.grid.cleanNodes();
Expand All @@ -823,13 +824,12 @@
node._beforeDragY = node.y;

self._updateContainerHeight();
} else {
if (!self.grid.canMoveNode(node, x, y)) {
return;
}
self.grid.moveNode(node, x, y);
self._updateContainerHeight();
}
if (!self.grid.canMoveNode(node, x, y)) {
return;
}
self.grid.moveNode(node, x, y);
self._updateContainerHeight();
};

this.dd
Expand Down

0 comments on commit 152cbd9

Please sign in to comment.