Skip to content

Commit 205df5d

Browse files
committed
Merge commit '3d19aede54055b00c3fe8c7b8affd8b7c9ab1fbe'
2 parents 620d190 + 3d19aed commit 205df5d

File tree

7 files changed

+370
-6
lines changed

7 files changed

+370
-6
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gridstack.js
55
[![Coverage Status](https://coveralls.io/repos/github/troolee/gridstack.js/badge.svg?branch=master)](https://coveralls.io/github/troolee/gridstack.js?branch=master)
66
[![Dependency Status](https://david-dm.org/troolee/gridstack.js.svg)](https://david-dm.org/troolee/gridstack.js)
77
[![devDependency Status](https://david-dm.org/troolee/gridstack.js/dev-status.svg)](https://david-dm.org/troolee/gridstack.js#info=devDependencies)
8+
[![Stories in Ready](https://badge.waffle.io/troolee/gridstack.js.png?label=ready&title=Ready)](http://waffle.io/troolee/gridstack.js)
89

910
gridstack.js is a jQuery plugin for widget layout. This is drag-and-drop multi-column grid. It allows you to build
1011
draggable responsive bootstrap v3 friendly layouts. It also works great with [knockout.js](http://knockoutjs.com), [angular.js](https://angularjs.org) and touch devices.

dist/gridstack.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,9 @@
537537
disableResize: opts.disableResize || false,
538538
rtl: 'auto',
539539
removable: false,
540-
removeTimeout: 2000
540+
removeTimeout: 2000,
541+
verticalMarginUnit: 'px',
542+
cellHeightUnit: 'px'
541543
});
542544

543545
if (this.opts.rtl === 'auto') {

dist/gridstack.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/gridstack.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ gridstack.js API
4848
- [setGridWidth(gridWidth, doNotPropagate)](#setgridwidthgridwidth-donotpropagate)
4949
- [setStatic(staticValue)](#setstaticstaticvalue)
5050
- [update(el, x, y, width, height)](#updateel-x-y-width-height)
51+
- [verticalMargin(value, noUpdate)](#verticalmarginvalue-noupdate)
5152
- [willItFit(x, y, width, height, autoPosition)](#willitfitx-y-width-height-autoposition)
5253
- [Utils](#utils)
5354
- [GridStackUI.Utils.sort(nodes[, dir[, width]])](#gridstackuiutilssortnodes-dir-width)
@@ -438,6 +439,13 @@ Parameters:
438439

439440
Updates widget position/size.
440441

442+
### verticalMargin(value, noUpdate)
443+
444+
Parameters:
445+
446+
- `value` - new vertical margin value.
447+
- `noUpdate` - if true, styles will not be updated.
448+
441449
### willItFit(x, y, width, height, autoPosition)
442450

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

0 commit comments

Comments
 (0)