Commit 383a1d9

authored

Merge pull request gridstack#3049 from adumesny/master

more `opts.animate`

2 parents 5deef08 + 653e98d commit 383a1d9Copy full SHA for 383a1d9

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ Change log`
`129`	`129`
`130`	`130`	`## 12.1.1-dev (TBD)`
`131`	`131`	* fix [#3043](https://github.com/gridstack/gridstack.js/issues/3043) fix `opts.animate` again
`132`		`-* fix [#3047](https://github.com/gridstack/gridstack.js/pull/3047) nested grid resizeToContentCBCheck() fix`
	`132`	`+* fix [#3048](https://github.com/gridstack/gridstack.js/pull/3048) nested grid resizeToContentCBCheck() fix`
`133`	`133`
`134`	`134`
`135`	`135`	`## 12.1.1 (2024年04月28日)`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2251,9 +2251,11 @@ export class GridStack {`
`2251`	`2251`	`delete this.placeholder.gridstackNode;`
`2252`	`2252`
`2253`	`2253`	`// disable animation when replacing a placeholder (already positioned) with actual content`
`2254`		`- const noAnim = wasAdded && this.opts.animate;`
`2255`		`- if (noAnim) this.setAnimation(false);`
`2256`		`-`
	`2254`	`+ if (wasAdded && this.opts.animate) {`
	`2255`	`+ this.setAnimation(false);`
	`2256`	`+ this.setAnimation(true, true); // delay adding back`
	`2257`	`+ }`
	`2258`	`+`
`2257`	`2259`	`// notify previous grid of removal`
`2258`	`2260`	`// console.log('drop delete _gridstackNodeOrig') // TEST`
`2259`	`2261`	`const origNode = el._gridstackNodeOrig;`
`@@ -2314,9 +2316,6 @@ export class GridStack {`
`2314`	`2316`	`this._gsEventHandler['dropped']({ ...event, type: 'dropped' }, origNode && origNode.grid ? origNode : undefined, node);`
`2315`	`2317`	`}`
`2316`	`2318`
`2317`		`- // delay adding animation back`
`2318`		`- if (noAnim) this.setAnimation(this.opts.animate, true);`
`2319`		`-`
`2320`	`2319`	`return false; // prevent parent from receiving msg (which may be grid as well)`
`2321`	`2320`	`});`
`2322`	`2321`	`return this;`

Comments

(0)