Skip to content

Commit cc89ff3

Browse files
authored
Merge pull request #760 from radiolips/bugfix/743-real
Add in dist changes and readme changes. Also fix 120 character break.
2 parents 34ddf0a + f005fae commit cc89ff3

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

dist/gridstack.all.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.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,11 +1218,13 @@
12181218
resize: dragOrResize
12191219
});
12201220

1221-
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag) {
1221+
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag ||
1222+
this.opts.staticGrid) {
12221223
this.dd.draggable(el, 'disable');
12231224
}
12241225

1225-
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize) {
1226+
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize ||
1227+
this.opts.staticGrid) {
12261228
this.dd.resizable(el, 'disable');
12271229
}
12281230

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/CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Change log
2222

2323
- widgets can have their own resize handles. Use `data-gs-resize-handles` element attribute to use. For example, `data-gs-resize-handles="e,w"` will make the particular widget only resize west and east. ([#494](https://github.com/troolee/gridstack.js/issues/494)).
2424
- enable sidebar items to be duplicated properly. Pass `helper: 'clone'` in `draggable` options. ([#661](https://github.com/troolee/gridstack.js/issues/661), ([#396](https://github.com/troolee/gridstack.js/issues/396), ([#499](https://github.com/troolee/gridstack.js/issues/499)).
25+
- fix `staticGrid` grid option ([#743](https://github.com/troolee/gridstack.js/issues/743))
2526

2627
## v0.3.0 (2017-04-21)
2728

src/gridstack.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,11 +1218,13 @@
12181218
resize: dragOrResize
12191219
});
12201220

1221-
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag || this.opts.staticGrid) {
1221+
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag ||
1222+
this.opts.staticGrid) {
12221223
this.dd.draggable(el, 'disable');
12231224
}
12241225

1225-
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize || this.opts.staticGrid) {
1226+
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize ||
1227+
this.opts.staticGrid) {
12261228
this.dd.resizable(el, 'disable');
12271229
}
12281230

0 commit comments

Comments
 (0)