Skip to content

Commit 1c040b7

Browse files
committed
Merge commit 'bc6222771710a1820e304ff9635664df448d939b'
2 parents e1602ed + bc62227 commit 1c040b7

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ See example: [Responsive grid demo](http://troolee.github.io/gridstack.js/demo/r
444444
## Using AniJS
445445

446446
Using AniJS with gridstack is a breeze. In the following example, a listener is added that gets triggered by a widget being added.
447-
See example: [AniJS demo](http://troolee.github.io/gridstack.js/demo/anijs.html)
447+
See widgets wiggle! [AniJS demo](http://troolee.github.io/gridstack.js/demo/anijs.html)
448448

449449
The Team
450450
========
@@ -473,7 +473,7 @@ Changes
473473
- add `setAnimation` method to API
474474
- add `setGridWidth` method ([#227](https://github.com/troolee/gridstack.js/issues/227))
475475
- add `removable`/`removeTimeout`
476-
- add `detachGrid` parameter to `destroy` method ([#216](https://github.com/troolee/gridstack.js/issues/216))
476+
- add `detachGrid` parameter to `destroy` method ([#216](https://github.com/troolee/gridstack.js/issues/216)) (thanks @jhpedemonte)
477477
- add `useOffset` parameter to `getCellFromPixel` method ([#237](https://github.com/troolee/gridstack.js/issues/237))
478478
- add `minWidth`, `maxWidth`, `minHeight`, `maxHeight`, `id` parameters to `addWidget` ([#188](https://github.com/troolee/gridstack.js/issues/188))
479479
- add `added` and `removed` events for when a widget is added or removed, respectively. ([#54](https://github.com/troolee/gridstack.js/issues/54))
@@ -487,7 +487,7 @@ Changes
487487
- add `placeholder_text` option (Thanks to @slauyama)
488488
- add `handle_class` option.
489489
- add `make_widget` method.
490-
- lodash v 4.x support (Thanks to Andy Robbins)
490+
- lodash v 4.x support (Thanks to @andrewr88)
491491

492492
#### v0.2.3 (2015-06-23)
493493

dist/gridstack.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@
11051105
$(window).off('resize', this.onResizeHandler);
11061106
this.disable();
11071107
if (typeof detachGrid != 'undefined' && !detachGrid) {
1108-
this.removeAll(true);
1108+
this.removeAll(false);
11091109
} else {
11101110
this.container.remove();
11111111
}

0 commit comments

Comments
 (0)