angular-gridster2
Advanced tools
Comparing version 2.4.13 to 2.4.14
@@ -62,2 +62,6 @@ "use strict"; | ||
var gridsterItemCollide = gridsterItemCollision; | ||
var copyCollisionX = gridsterItemCollide.$item.x; | ||
var copyCollisionY = gridsterItemCollide.$item.y; | ||
var copyX = pushedBy.$item.x; | ||
var copyY = pushedBy.$item.y; | ||
gridsterItemCollide.$item.x = pushedBy.item.x || 0; | ||
@@ -68,6 +72,6 @@ gridsterItemCollide.$item.y = pushedBy.item.y || 0; | ||
if (this.gridster.checkCollision(gridsterItemCollide.$item) || this.gridster.checkCollision(pushedBy.$item)) { | ||
pushedBy.$item.x = gridsterItemCollide.$item.x; | ||
pushedBy.$item.y = gridsterItemCollide.$item.y; | ||
gridsterItemCollide.$item.x = gridsterItemCollide.item.x || 0; | ||
gridsterItemCollide.$item.y = gridsterItemCollide.item.y || 0; | ||
pushedBy.$item.x = copyX; | ||
pushedBy.$item.y = copyY; | ||
gridsterItemCollide.$item.x = copyCollisionX; | ||
gridsterItemCollide.$item.y = copyCollisionY; | ||
} | ||
@@ -74,0 +78,0 @@ else { |
{ | ||
"name": "angular-gridster2", | ||
"version": "2.4.13", | ||
"version": "2.4.14", | ||
"license": "MIT", | ||
@@ -63,3 +63,3 @@ "main": "dist/index.js", | ||
"@types/jasmine": "2.6.0", | ||
"@types/node": "8.0.33", | ||
"@types/node": "8.0.46", | ||
"codelyzer": "3.2.1", | ||
@@ -79,3 +79,3 @@ "core-js": "2.5.1", | ||
"karma-jasmine-html-reporter": "0.2.2", | ||
"protractor": "5.1.2", | ||
"protractor": "5.2.0", | ||
"rxjs": "5.2.0", | ||
@@ -82,0 +82,0 @@ "systemjs": "0.20.19", |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
294889
2971
0