Skip to content

Commit deff21d

Browse files
committed
Merge pull request #162 from martynsmall/master
Fix resize/move issue in one column mode
2 parents 8314837 + feab5d8 commit deff21d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

dist/gridstack.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,7 @@
781781
};
782782

783783
GridStack.prototype.resizable = function(el, val) {
784+
var self = this;
784785
el = $(el);
785786
el.each(function(index, el) {
786787
el = $(el);
@@ -790,7 +791,7 @@
790791
}
791792

792793
node.no_resize = !(val || false);
793-
if (node.no_resize) {
794+
if (node.no_resize || self._is_one_column_mode()) {
794795
el.resizable('disable');
795796
}
796797
else {
@@ -801,6 +802,7 @@
801802
};
802803

803804
GridStack.prototype.movable = function(el, val) {
805+
var self = this;
804806
el = $(el);
805807
el.each(function(index, el) {
806808
el = $(el);
@@ -810,7 +812,7 @@
810812
}
811813

812814
node.no_move = !(val || false);
813-
if (node.no_move) {
815+
if (node.no_move || self._is_one_column_mode()) {
814816
el.draggable('disable');
815817
el.removeClass('ui-draggable-handle');
816818
}

src/gridstack.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,7 @@
781781
};
782782

783783
GridStack.prototype.resizable = function(el, val) {
784+
var self = this;
784785
el = $(el);
785786
el.each(function(index, el) {
786787
el = $(el);
@@ -790,7 +791,7 @@
790791
}
791792

792793
node.no_resize = !(val || false);
793-
if (node.no_resize) {
794+
if (node.no_resize || self._is_one_column_mode()) {
794795
el.resizable('disable');
795796
}
796797
else {
@@ -801,6 +802,7 @@
801802
};
802803

803804
GridStack.prototype.movable = function(el, val) {
805+
var self = this;
804806
el = $(el);
805807
el.each(function(index, el) {
806808
el = $(el);
@@ -810,7 +812,7 @@
810812
}
811813

812814
node.no_move = !(val || false);
813-
if (node.no_move) {
815+
if (node.no_move || self._is_one_column_mode()) {
814816
el.draggable('disable');
815817
el.removeClass('ui-draggable-handle');
816818
}

0 commit comments

Comments
 (0)