Sortable: Optimize _intersectsWithPointer()

victor-homyakov · scottgonzalez · commit f7ee8524b337 · 2015-07-08T13:00:50.000-04:00
Closes jquerygh-1574
diff --git 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) );
 
 	},
