diff options
Diffstat (limited to 'ui/sortable.js')
| -rw-r--r-- | ui/sortable.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ui/sortable.js b/ui/sortable.js index 6d872cbe6..bf1bf6a89 100644 --- a/ui/sortable.js +++ b/ui/sortable.js @@ -588,18 +588,20 @@ return $.widget("ui.sortable", $.ui.mouse, { _intersectsWithPointer: function(item) { - var isOverElementHeight = (this.options.axis === "x") || this._isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height), + var verticalDirection, horizontalDirection, + isOverElementHeight = (this.options.axis === "x") || this._isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height), isOverElementWidth = (this.options.axis === "y") || this._isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width), - isOverElement = isOverElementHeight && isOverElementWidth, - verticalDirection = this._getDragVerticalDirection(), - horizontalDirection = this._getDragHorizontalDirection(); + isOverElement = isOverElementHeight && isOverElementWidth; if (!isOverElement) { return false; } + verticalDirection = this._getDragVerticalDirection(); + horizontalDirection = this._getDragHorizontalDirection(); + return this.floating ? - ( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 ) + ( (horizontalDirection === "right" || verticalDirection === "down") ? 2 : 1 ) : ( verticalDirection && (verticalDirection === "down" ? 2 : 1) ); }, |