Commit fead8d3

authored

Merge pull request gridstack#3045 from adumesny/master

fix `opts.animate` again

2 parents 3517210 + c83bd55 commit fead8d3Copy full SHA for fead8d3

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,10 @@ Change log`
`126`	`126`
`127`	`127`	`<!-- END doctoc generated TOC please keep comment here to allow auto update -->`
`128`	`128`
	`129`	`+## 12.1.1-dev (TBD)`
	`130`	+* fix [#3043](https://github.com/gridstack/gridstack.js/issues/3043) fix `opts.animate` again
	`131`	`+`
	`132`	`+`
`129`	`133`	`## 12.1.1 (2024年04月28日)`
`130`	`134`	* fix [#3038](https://github.com/gridstack/gridstack.js/pull/3038) `updateOptions()` fix opts.minRow being undefined
`131`	`135`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import {`
`23`	`23`	`import { DDGridStack } from './dd-gridstack';`
`24`	`24`	`import { isTouch } from './dd-touch';`
`25`	`25`	`import { DDManager } from './dd-manager';`
`26`		`-import { DDElementHost } from './dd-element';/** global instance */`
	`26`	`+import { DDElementHost } from './dd-element';/** global instance */`
`27`	`27`	`const dd = new DDGridStack;`
`28`	`28`
`29`	`29`	`// export all dependent file as well to make it easier for users to just import the main file`
`@@ -704,7 +704,8 @@ export class GridStack {`
`704`	`704`
`705`	`705`	`// if we are loading from empty temporarily remove animation`
`706`	`706`	`const blank = !this.engine.nodes.length;`
`707`		`- if (blank) this.setAnimation(false);`
	`707`	`+ const noAnim = blank && this.opts.animate;`
	`708`	`+ if (noAnim) this.setAnimation(false);`
`708`	`709`
`709`	`710`	`// see if any items are missing from new layout and need to be removed first`
`710`	`711`	`if (!blank && addRemove) {`
`@@ -769,8 +770,7 @@ export class GridStack {`
`769`	`770`	`delete this._ignoreLayoutsNodeChange;`
`770`	`771`	`delete this.engine.skipCacheUpdate;`
`771`	`772`	`prevCB ? GridStack.addRemoveCB = prevCB : delete GridStack.addRemoveCB;`
`772`		`- // delay adding animation back`
`773`		`- if (blank && this.opts?.animate) this.setAnimation(this.opts.animate, true);`
	`773`	`+ if (noAnim) this.setAnimation(true, true); // delay adding animation back`
`774`	`774`	`return this;`
`775`	`775`	`}`
`776`	`776`

Comments

(0)