Skip to content

Commit 195fa60

Browse files
committed
build dist
1 parent 81e6351 commit 195fa60

File tree

5 files changed

+28
-17
lines changed

5 files changed

+28
-17
lines changed

dist/gridstack.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
}
7171
.grid-stack > .grid-stack-item > .ui-resizable-se {
7272
display: inline-block;
73-
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
7473
-webkit-transform: rotate(90deg);
7574
-moz-transform: rotate(90deg);
7675
-ms-transform: rotate(90deg);
@@ -296,8 +295,11 @@
296295
/*
297296
.grid-stack > .grid-stack-item > .ui-resizable-sw {
298297
display: inline-block;
299-
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
300-
@include vendor(transform, rotate(180deg));
298+
-webkit-transform: rotate(180deg);
299+
-moz-transform: rotate(180deg);
300+
-ms-transform: rotate(180deg);
301+
-o-transform: rotate(180deg);
302+
transform: rotate(180deg);
301303
}
302304
*/
303305
@media (max-width: 768px) {

dist/gridstack.js

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
// gridstack.js 0.2.4-dev
22
// http://troolee.github.io/gridstack.js/
3-
// (c) 2014-2015 Pavel Reznikov
3+
// (c) 2014-2016 Pavel Reznikov
44
// gridstack.js may be freely distributed under the MIT license.
55

66
(function(factory) {
77
if (typeof define === 'function' && define.amd) {
88
define(['jquery', 'lodash', 'jquery-ui/core', 'jquery-ui/widget', 'jquery-ui/mouse', 'jquery-ui/draggable',
99
'jquery-ui/resizable'], factory);
1010
}
11+
else if (typeof exports !== 'undefined') {
12+
try { jQuery = require('jquery'); } catch(e) {}
13+
try { _ = require('lodash'); } catch(e) {}
14+
factory(jQuery, _);
15+
}
1116
else {
1217
factory(jQuery, _);
1318
}
@@ -99,9 +104,9 @@
99104
}
100105

101106
while (true) {
102-
var collision_node = _.find(this.nodes, function(n) {
107+
var collision_node = _.find(this.nodes, _.bind(function(n) {
103108
return n != node && Utils.is_intercepted(n, nn);
104-
}, this);
109+
}, this));
105110
if (typeof collision_node == 'undefined') {
106111
return;
107112
}
@@ -112,9 +117,9 @@
112117

113118
GridStackEngine.prototype.is_area_empty = function(x, y, width, height) {
114119
var nn = {x: x || 0, y: y || 0, width: width || 1, height: height || 1};
115-
var collision_node = _.find(this.nodes, function(n) {
120+
var collision_node = _.find(this.nodes, _.bind(function(n) {
116121
return Utils.is_intercepted(n, nn);
117-
}, this);
122+
}, this));
118123
return collision_node == null;
119124
};
120125

@@ -126,7 +131,7 @@
126131
this._sort_nodes();
127132

128133
if (this.float) {
129-
_.each(this.nodes, function(n, i) {
134+
_.each(this.nodes, _.bind(function(n, i) {
130135
if (n._updating || typeof n._orig_y == 'undefined' || n.y == n._orig_y)
131136
return;
132137

@@ -145,10 +150,10 @@
145150
}
146151
--new_y;
147152
}
148-
}, this);
153+
}, this));
149154
}
150155
else {
151-
_.each(this.nodes, function(n, i) {
156+
_.each(this.nodes, _.bind(function(n, i) {
152157
if (n.locked)
153158
return;
154159
while (n.y > 0) {
@@ -171,7 +176,7 @@
171176
n._dirty = n.y != new_y;
172177
n.y = new_y;
173178
}
174-
}, this);
179+
}, this));
175180
}
176181
};
177182

@@ -748,9 +753,9 @@
748753
};
749754

750755
GridStack.prototype.remove_all = function(detach_node) {
751-
_.each(this.grid.nodes, function(node) {
756+
_.each(this.grid.nodes, _.bind(function(node) {
752757
this.remove_widget(node.el, detach_node);
753-
}, this);
758+
}, this));
754759
this.grid.nodes = [];
755760
this._update_container_height();
756761
};
@@ -796,9 +801,11 @@
796801
node.no_move = !(val || false);
797802
if (node.no_move) {
798803
el.draggable('disable');
804+
el.removeClass('ui-draggable-handle');
799805
}
800806
else {
801807
el.draggable('enable');
808+
el.addClass('ui-draggable-handle');
802809
}
803810
});
804811
return this;
@@ -807,11 +814,13 @@
807814
GridStack.prototype.disable = function() {
808815
this.movable(this.container.children('.' + this.opts.item_class), false);
809816
this.resizable(this.container.children('.' + this.opts.item_class), false);
817+
this.container.trigger('disable');
810818
};
811819

812820
GridStack.prototype.enable = function() {
813821
this.movable(this.container.children('.' + this.opts.item_class), true);
814822
this.resizable(this.container.children('.' + this.opts.item_class), true);
823+
this.container.trigger('enable');
815824
};
816825

817826
GridStack.prototype.locked = function(el, val) {

dist/gridstack.min.css

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

0 commit comments

Comments
 (0)