Skip to content

Commit

Permalink
Merge pull request #375 from radiolips/tests/frontend-1
Browse files Browse the repository at this point in the history
Tests/frontend 1
  • Loading branch information
radiolips committed Mar 1, 2016
2 parents 1dd2420 + 398dccb commit 3d19aed
Show file tree
Hide file tree
Showing 6 changed files with 369 additions and 6 deletions.
4 changes: 3 additions & 1 deletion dist/gridstack.js
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,9 @@
disableResize: opts.disableResize || false,
rtl: 'auto',
removable: false,
removeTimeout: 2000
removeTimeout: 2000,
verticalMarginUnit: 'px',
cellHeightUnit: 'px'
});

if (this.opts.rtl === 'auto') {
Expand Down
2 changes: 1 addition & 1 deletion dist/gridstack.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/gridstack.min.map

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ gridstack.js API
- [setGridWidth(gridWidth, doNotPropagate)](#setgridwidthgridwidth-donotpropagate)
- [setStatic(staticValue)](#setstaticstaticvalue)
- [update(el, x, y, width, height)](#updateel-x-y-width-height)
- [verticalMargin(value, noUpdate)](#verticalmarginvalue-noupdate)
- [willItFit(x, y, width, height, autoPosition)](#willitfitx-y-width-height-autoposition)
- [Utils](#utils)
- [GridStackUI.Utils.sort(nodes[, dir[, width]])](#gridstackuiutilssortnodes-dir-width)
Expand Down Expand Up @@ -438,6 +439,13 @@ Parameters:

Updates widget position/size.

### verticalMargin(value, noUpdate)

Parameters:

- `value` - new vertical margin value.
- `noUpdate` - if true, styles will not be updated.

### willItFit(x, y, width, height, autoPosition)

Returns `true` if the `height` of the grid will be less the vertical constraint. Always returns `true` if grid doesn't
Expand Down
Loading

0 comments on commit 3d19aed

Please sign in to comment.