Skip to content

code cleanup #1950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adumesny merged 1 commit into from
Apr 5, 2022
Merged

code cleanup #1950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions src/gridstack-engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ export class GridStackEngine {
o.pack = true;

// simpler case: move item directly...
if (!this.maxRow/* && !this._hasLocked*/) {
if (!this.maxRow) {
return this.moveNode(node, o);
}

Expand All @@ -543,17 +543,14 @@ export class GridStackEngine {
});
if (!clonedNode) return false;

let canMove = clone.moveNode(clonedNode, o);
// if maxRow make sure we are still valid size
if (this.maxRow && canMove) {
canMove = (clone.getRow() <= this.maxRow);
// turns out we can't grow, then see if we can swap instead (ex: full grid) if we're not resizing
if (!canMove && !o.resizing) {
let collide = this.collide(node, o);
if (collide && this.swap(node, collide)) {
this._notify();
return true;
}
// make sure we are still valid size
let canMove = clone.moveNode(clonedNode, o) && clone.getRow() <= this.maxRow;
// turns out we can't grow, then see if we can swap instead (ex: full grid) if we're not resizing
if (!canMove && !o.resizing) {
let collide = this.collide(node, o);
if (collide && this.swap(node, collide)) {
this._notify();
return true;
}
}
if (!canMove) return false;
Expand Down Expand Up @@ -593,7 +590,7 @@ export class GridStackEngine {

/** true if x,y or w,h are different after clamping to min/max */
public changedPosConstrain(node: GridStackNode, p: GridStackPosition): boolean {
// make sure w,h are set
// first make sure w,h are set for caller
p.w = p.w || node.w;
p.h = p.h || node.h;
if (node.x !== p.x || node.y !== p.y) return true;
Expand Down