Skip to content

Commit 308a33b

Browse files
committed
Merge commit 'af1729497132ad4d9fca8c5944e473d058d71787'
2 parents c34777b + af17294 commit 308a33b

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,8 @@ Changes
441441
- remove dependency of FontAwesome
442442
- RTL support
443443
- `'auto'` value for `cellHeight` option
444+
- fix `setStatic` method
445+
- add `setAnimation` method to API
444446

445447
#### v0.2.4 (2016-02-15)
446448

doc/README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ gridstack.js API
4242
- [removeAll()](#removeall)
4343
- [resize(el, width, height)](#resizeel-width-height)
4444
- [resizable(el, val)](#resizableel-val)
45+
- [setAnimation(doAnimate)](#setanimationdoanimate)
4546
- [setStatic(staticValue)](#setstaticstaticvalue)
4647
- [update(el, x, y, width, height)](#updateel-x-y-width-height)
4748
- [willItFit(x, y, width, height, autoPosition)](#willitfitx-y-width-height-autoposition)
@@ -365,11 +366,17 @@ Enables/Disables resizing.
365366
- `el` - widget to modify
366367
- `val` - if `true` widget will be resizable.
367368

369+
### setAnimation(doAnimate)
370+
371+
Toggle the grid animation state. Toggles the `grid-stack-animate` class.
372+
373+
- `doAnimate` - if `true` the grid will animate.
374+
368375
### setStatic(staticValue)
369376

370377
Toggle the grid static state. Also toggle the `grid-stack-static` class.
371378

372-
- `staticValue` - if `true` the grid become static.
379+
- `staticValue` - if `true` the grid becomes static.
373380

374381
### update(el, x, y, width, height)
375382

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"grunt-contrib-uglify": "^0.10.1",
2929
"grunt-contrib-watch": "^0.6.1",
3030
"grunt-doctoc": "^0.1.1",
31-
"grunt-sass": "^1.1.0"
31+
"grunt-sass": "^1.1.0",
32+
"grunt-jscs": "^2.7.0"
3233
}
3334
}

0 commit comments

Comments
 (0)