Commit f005fae7 authored by Dylan Weiss's avatar Dylan Weiss
Browse files

Add in dist changes and readme changes. Also fix 120 character break.

parent aec1135b
This diff is collapsed.
......@@ -1218,11 +1218,13 @@
resize: dragOrResize
});
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag) {
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag ||
this.opts.staticGrid) {
this.dd.draggable(el, 'disable');
}
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize) {
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize ||
this.opts.staticGrid) {
this.dd.resizable(el, 'disable');
}
......
This diff is collapsed.
This diff is collapsed.
......@@ -22,6 +22,7 @@ Change log
- 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)).
- 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)).
- fix `staticGrid` grid option ([#743](https://github.com/troolee/gridstack.js/issues/743))
## v0.3.0 (2017-04-21)
......
......@@ -1218,11 +1218,13 @@
resize: dragOrResize
});
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag || this.opts.staticGrid) {
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag ||
this.opts.staticGrid) {
this.dd.draggable(el, 'disable');
}
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize || this.opts.staticGrid) {
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize ||
this.opts.staticGrid) {
this.dd.resizable(el, 'disable');
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment