|
1 | 1 | /** |
2 | | - * gridstack.js 0.2.5-dev |
| 2 | + * gridstack.js 0.2.5 |
3 | 3 | * http://troolee.github.io/gridstack.js/ |
4 | 4 | * (c) 2014-2016 Pavel Reznikov |
5 | 5 | * gridstack.js may be freely distributed under the MIT license. |
|
646 | 646 | if (node.noResize || self.opts.disableResize) { |
647 | 647 | node.el.resizable('disable'); |
648 | 648 | } |
| 649 | + |
| 650 | + node.el.trigger('resize'); |
649 | 651 | }); |
650 | 652 | } else { |
651 | 653 | if (!oneColumnMode) { |
|
665 | 667 | if (!node.noResize && !self.opts.disableResize) { |
666 | 668 | node.el.resizable('enable'); |
667 | 669 | } |
| 670 | + |
| 671 | + node.el.trigger('resize'); |
668 | 672 | }); |
669 | 673 | } |
670 | 674 | }; |
671 | 675 |
|
672 | 676 | $(window).resize(this.onResizeHandler); |
673 | 677 | this.onResizeHandler(); |
674 | 678 |
|
675 | | - if (typeof self.opts.removable === 'string') { |
| 679 | + if (!self.opts.staticGrid && typeof self.opts.removable === 'string') { |
676 | 680 | var trashZone = $(self.opts.removable); |
677 | 681 | if (!trashZone.data('droppable')) { |
678 | 682 | trashZone.droppable({ |
679 | 683 | accept: '.' + self.opts.itemClass |
680 | 684 | }); |
681 | 685 | } |
682 | 686 | trashZone |
683 | | - .on('dropover', function(event, ui) { |
684 | | - var el = $(ui.draggable); |
685 | | - var node = el.data('_gridstack_node'); |
686 | | - if (node._grid !== self) { |
687 | | - return; |
688 | | - } |
689 | | - self._setupRemovingTimeout(el); |
690 | | - }) |
691 | | - .on('dropout', function(event, ui) { |
692 | | - var el = $(ui.draggable); |
693 | | - var node = el.data('_gridstack_node'); |
694 | | - if (node._grid !== self) { |
695 | | - return; |
696 | | - } |
697 | | - self._clearRemovingTimeout(el); |
698 | | - }); |
699 | | - } |
700 | | - |
701 | | - if (self.opts.acceptWidgets) { |
| 687 | + .on('dropover', function(event, ui) { |
| 688 | + var el = $(ui.draggable); |
| 689 | + var node = el.data('_gridstack_node'); |
| 690 | + if (node._grid !== self) { |
| 691 | + return; |
| 692 | + } |
| 693 | + self._setupRemovingTimeout(el); |
| 694 | + }) |
| 695 | + .on('dropout', function(event, ui) { |
| 696 | + var el = $(ui.draggable); |
| 697 | + var node = el.data('_gridstack_node'); |
| 698 | + if (node._grid !== self) { |
| 699 | + return; |
| 700 | + } |
| 701 | + self._clearRemovingTimeout(el); |
| 702 | + }); |
| 703 | + } |
| 704 | + |
| 705 | + if (!self.opts.staticGrid && self.opts.acceptWidgets) { |
702 | 706 | var draggingElement = null; |
703 | 707 |
|
704 | 708 | var onDrag = function(event, ui) { |
|
797 | 801 | .removeClass('ui-draggable ui-draggable-dragging ui-draggable-disabled') |
798 | 802 | .unbind('drag', onDrag); |
799 | 803 | self.container.append(el); |
800 | | - self._prepareElementByNode(el, node); |
| 804 | + self._prepareElementsByNode(el, node); |
801 | 805 | self._updateContainerHeight(); |
802 | 806 | self._triggerChangeEvent(); |
803 | 807 |
|
|
965 | 969 | node._isAboutToRemove = false; |
966 | 970 | }; |
967 | 971 |
|
968 | | - GridStack.prototype._prepareElementByNode = function(el, node) { |
| 972 | + GridStack.prototype._prepareElementsByNode = function(el, node) { |
969 | 973 | var self = this; |
970 | 974 |
|
971 | 975 | var cellWidth; |
|
1115 | 1119 | resize: dragOrResize |
1116 | 1120 | })); |
1117 | 1121 |
|
1118 | | - if (node.noMove || this._isOneColumnMode() || this.opts.staticGrid || this.opts.disableDrag) { |
| 1122 | + if (node.noMove || this._isOneColumnMode() || this.opts.disableDrag) { |
1119 | 1123 | el.draggable('disable'); |
1120 | 1124 | } |
1121 | 1125 |
|
1122 | | - if (node.noResize || this._isOneColumnMode() || this.opts.staticGrid || this.opts.disableResize) { |
| 1126 | + if (node.noResize || this._isOneColumnMode() || this.opts.disableResize) { |
1123 | 1127 | el.resizable('disable'); |
1124 | 1128 | } |
1125 | 1129 |
|
|
1151 | 1155 | }, triggerAddEvent); |
1152 | 1156 | el.data('_gridstack_node', node); |
1153 | 1157 |
|
1154 | | - this._prepareElementByNode(el, node); |
| 1158 | + if (!this.opts.staticGrid) { |
| 1159 | + this._prepareElementsByNode(el, node); |
| 1160 | + } |
1155 | 1161 | }; |
1156 | 1162 |
|
1157 | 1163 | GridStack.prototype.setAnimation = function(enable) { |
|
1247 | 1253 | el.each(function(index, el) { |
1248 | 1254 | el = $(el); |
1249 | 1255 | var node = el.data('_gridstack_node'); |
1250 | | - if (typeof node == 'undefined' || node === null) { |
| 1256 | + if (self.opts.staticGrid || typeof node == 'undefined' || node === null) { |
1251 | 1257 | return; |
1252 | 1258 | } |
1253 | 1259 |
|
|
1267 | 1273 | el.each(function(index, el) { |
1268 | 1274 | el = $(el); |
1269 | 1275 | var node = el.data('_gridstack_node'); |
1270 | | - if (typeof node == 'undefined' || node === null) { |
| 1276 | + if (self.opts.staticGrid || typeof node == 'undefined' || node === null) { |
1271 | 1277 | return; |
1272 | 1278 | } |
1273 | 1279 |
|
|
0 commit comments