angular-gridster2
Advanced tools
Comparing version 3.0.1 to 3.0.2
@@ -75,3 +75,4 @@ "use strict"; | ||
GridsterPush.prototype.trySouth = function (gridsterItemCollide, gridsterItem, direction, pushedBy) { | ||
gridsterItemCollide.$item.y += 1; | ||
var backUpY = gridsterItemCollide.$item.y; | ||
gridsterItemCollide.$item.y = gridsterItem.$item.y + gridsterItem.$item.rows; | ||
if (!gridster_component_1.GridsterComponent.checkCollisionTwoItems(gridsterItemCollide, gridsterItem) | ||
@@ -85,9 +86,9 @@ && this.push(gridsterItemCollide, this.fromNorth, gridsterItem)) { | ||
else { | ||
gridsterItemCollide.$item.y -= 1; | ||
gridsterItemCollide.$item.y = backUpY; | ||
} | ||
}; | ||
GridsterPush.prototype.tryNorth = function (gridsterItemCollide, gridsterItem, direction, pushedBy) { | ||
gridsterItemCollide.$item.y -= 1; | ||
if (!gridster_component_1.GridsterComponent.checkCollisionTwoItems(gridsterItemCollide, gridsterItem) | ||
&& this.push(gridsterItemCollide, this.fromSouth, gridsterItem)) { | ||
var backUpY = gridsterItemCollide.$item.y; | ||
gridsterItemCollide.$item.y = gridsterItem.$item.y - gridsterItemCollide.$item.rows; | ||
if (this.push(gridsterItemCollide, this.fromSouth, gridsterItem)) { | ||
gridsterItemCollide.setSize(true); | ||
@@ -99,7 +100,8 @@ this.addToPushed(gridsterItemCollide); | ||
else { | ||
gridsterItemCollide.$item.y += 1; | ||
gridsterItemCollide.$item.y = backUpY; | ||
} | ||
}; | ||
GridsterPush.prototype.tryEast = function (gridsterItemCollide, gridsterItem, direction, pushedBy) { | ||
gridsterItemCollide.$item.x += 1; | ||
var backUpX = gridsterItemCollide.$item.x; | ||
gridsterItemCollide.$item.x = gridsterItem.$item.x + gridsterItem.$item.cols; | ||
if (!gridster_component_1.GridsterComponent.checkCollisionTwoItems(gridsterItemCollide, gridsterItem) | ||
@@ -113,7 +115,8 @@ && this.push(gridsterItemCollide, this.fromWest, gridsterItem)) { | ||
else { | ||
gridsterItemCollide.$item.x -= 1; | ||
gridsterItemCollide.$item.x = backUpX; | ||
} | ||
}; | ||
GridsterPush.prototype.tryWest = function (gridsterItemCollide, gridsterItem, direction, pushedBy) { | ||
gridsterItemCollide.$item.x -= 1; | ||
var backUpX = gridsterItemCollide.$item.x; | ||
gridsterItemCollide.$item.x = gridsterItem.$item.x - gridsterItemCollide.$item.cols; | ||
if (!gridster_component_1.GridsterComponent.checkCollisionTwoItems(gridsterItemCollide, gridsterItem) | ||
@@ -127,3 +130,3 @@ && this.push(gridsterItemCollide, this.fromEast, gridsterItem)) { | ||
else { | ||
gridsterItemCollide.$item.x += 1; | ||
gridsterItemCollide.$item.x = backUpX; | ||
} | ||
@@ -156,3 +159,2 @@ }; | ||
var j = path.length - 2; | ||
var change = false; | ||
var lastPosition; | ||
@@ -164,6 +166,10 @@ for (; j > -1; j--) { | ||
if (!this.gridster.findItemWithItem(pushedItem)) { | ||
change = true; | ||
pushedItem.setSize(true); | ||
path.splice(j + 1, path.length - 1 - j); | ||
} | ||
else { | ||
lastPosition = path[path.length - 1]; | ||
pushedItem.$item.x = lastPosition.x; | ||
pushedItem.$item.y = lastPosition.y; | ||
} | ||
} | ||
@@ -173,7 +179,2 @@ if (path.length < 2) { | ||
} | ||
if (!change) { | ||
lastPosition = path[path.length - 1]; | ||
pushedItem.$item.x = lastPosition.x; | ||
pushedItem.$item.y = lastPosition.y; | ||
} | ||
}; | ||
@@ -180,0 +181,0 @@ return GridsterPush; |
{ | ||
"name": "angular-gridster2", | ||
"version": "3.0.1", | ||
"version": "3.0.2", | ||
"license": "MIT", | ||
@@ -49,19 +49,19 @@ "main": "dist/index.js", | ||
"devDependencies": { | ||
"@angular/animations": "4.2.3", | ||
"@angular/cli": "1.1.2", | ||
"@angular/common": "4.2.3", | ||
"@angular/compiler": "4.2.3", | ||
"@angular/compiler-cli": "4.2.3", | ||
"@angular/core": "4.2.3", | ||
"@angular/forms": "4.2.3", | ||
"@angular/http": "4.2.3", | ||
"@angular/language-service": "4.2.3", | ||
"@angular/animations": "4.2.4", | ||
"@angular/cli": "1.1.3", | ||
"@angular/common": "4.2.4", | ||
"@angular/compiler": "4.2.4", | ||
"@angular/compiler-cli": "4.2.4", | ||
"@angular/core": "4.2.4", | ||
"@angular/forms": "4.2.4", | ||
"@angular/http": "4.2.4", | ||
"@angular/language-service": "4.2.4", | ||
"@angular/material": "2.0.0-beta.7", | ||
"@angular/platform-browser": "4.2.3", | ||
"@angular/platform-browser-dynamic": "4.2.3", | ||
"@angular/platform-server": "4.2.3", | ||
"@angular/router": "4.2.3", | ||
"@types/jasmine": "2.5.52", | ||
"@types/node": "8.0.0", | ||
"codelyzer": "3.0.1", | ||
"@angular/platform-browser": "4.2.4", | ||
"@angular/platform-browser-dynamic": "4.2.4", | ||
"@angular/platform-server": "4.2.4", | ||
"@angular/router": "4.2.4", | ||
"@types/jasmine": "2.5.53", | ||
"@types/node": "8.0.2", | ||
"codelyzer": "3.1.1", | ||
"core-js": "2.4.1", | ||
@@ -73,5 +73,5 @@ "gulp": "3.9.1", | ||
"jasmine-core": "2.6.4", | ||
"jasmine-spec-reporter": "4.1.0", | ||
"jasmine-spec-reporter": "4.1.1", | ||
"karma": "1.7.0", | ||
"karma-chrome-launcher": "2.1.1", | ||
"karma-chrome-launcher": "2.2.0", | ||
"karma-cli": "1.0.1", | ||
@@ -85,3 +85,3 @@ "karma-coverage-istanbul-reporter": "1.3.0", | ||
"ts-helpers": "1.1.2", | ||
"ts-node": "3.0.6", | ||
"ts-node": "3.1.0", | ||
"tslib": "1.7.1", | ||
@@ -88,0 +88,0 @@ "tslint": "5.4.3", |
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
212545
1984