Commit 57c65116 authored by radiolips's avatar radiolips Committed by GitHub
Browse files

Merge pull request #786 from adumesny/develop

fixed cellHeight() check for no-op return
parents 10e141ed b00f8160
...@@ -5,16 +5,16 @@ describe('gridstack', function() { ...@@ -5,16 +5,16 @@ describe('gridstack', function() {
var w; var w;
var gridstackHTML = var gridstackHTML =
'<div class="grid-stack">' + '<div class="grid-stack">' +
' <div class="grid-stack-item"' +
' data-gs-x="0" data-gs-y="0"' +
' data-gs-width="4" data-gs-height="2">' +
' <div class="grid-stack-item-content"></div>' +
' </div>' +
' <div class="grid-stack-item"' + ' <div class="grid-stack-item"' +
' data-gs-x="0" data-gs-y="0"' + ' data-gs-x="4" data-gs-y="0"' +
' data-gs-width="4" data-gs-height="2">' + ' data-gs-width="4" data-gs-height="4">' +
' <div class="grid-stack-item-content"></div>' + ' <div class="grid-stack-item-content"></div>' +
' </div>' + ' </div>' +
' <div class="grid-stack-item"' +
' data-gs-x="4" data-gs-y="0"' +
' data-gs-width="4" data-gs-height="4">' +
' <div class="grid-stack-item-content"></div>' +
' </div>' +
'</div>'; '</div>';
beforeEach(function() { beforeEach(function() {
...@@ -244,6 +244,38 @@ describe('gridstack', function() { ...@@ -244,6 +244,38 @@ describe('gridstack', function() {
}); });
}); });
describe('grid.cellHeight', function() {
beforeEach(function() {
document.body.insertAdjacentHTML(
'afterbegin', gridstackHTML);
});
afterEach(function() {
document.body.removeChild(document.getElementsByClassName('grid-stack')[0]);
});
it('should have no changes', function() {
var options = {
cellHeight: 80,
verticalMargin: 10,
width: 12
};
$('.grid-stack').gridstack(options);
var grid = $('.grid-stack').data('gridstack');
grid.cellHeight( grid.cellHeight() );
expect(grid.cellHeight()).toBe(80);
});
it('should change cellHeight to 120', function() {
var options = {
cellHeight: 80,
verticalMargin: 10,
width: 10
};
$('.grid-stack').gridstack(options);
var grid = $('.grid-stack').data('gridstack');
grid.cellHeight( 120 );
expect(grid.cellHeight()).toBe(120);
});
});
describe('grid.minWidth', function() { describe('grid.minWidth', function() {
beforeEach(function() { beforeEach(function() {
document.body.insertAdjacentHTML( document.body.insertAdjacentHTML(
...@@ -838,9 +870,9 @@ describe('gridstack', function() { ...@@ -838,9 +870,9 @@ describe('gridstack', function() {
$('.grid-stack').gridstack(options); $('.grid-stack').gridstack(options);
var grid = $('.grid-stack').data('gridstack'); var grid = $('.grid-stack').data('gridstack');
var widgetHTML = var widgetHTML =
' <div class="grid-stack-item">' + ' <div class="grid-stack-item">' +
' <div class="grid-stack-item-content"></div>' + ' <div class="grid-stack-item-content"></div>' +
' </div>'; ' </div>';
var widget = grid.addWidget(widgetHTML, 6, 7, 2, 3, false, 1, 4, 2, 5, 'coolWidget'); var widget = grid.addWidget(widgetHTML, 6, 7, 2, 3, false, 1, 4, 2, 5, 'coolWidget');
var $widget = $(widget); var $widget = $(widget);
expect(parseInt($widget.attr('data-gs-x'), 10)).toBe(6); expect(parseInt($widget.attr('data-gs-x'), 10)).toBe(6);
...@@ -872,9 +904,9 @@ describe('gridstack', function() { ...@@ -872,9 +904,9 @@ describe('gridstack', function() {
$('.grid-stack').gridstack(options); $('.grid-stack').gridstack(options);
var grid = $('.grid-stack').data('gridstack'); var grid = $('.grid-stack').data('gridstack');
var widgetHTML = var widgetHTML =
' <div class="grid-stack-item">' + ' <div class="grid-stack-item">' +
' <div class="grid-stack-item-content"></div>' + ' <div class="grid-stack-item-content"></div>' +
' </div>'; ' </div>';
var widget = grid.addWidget(widgetHTML, 9, 7, 2, 3, true); var widget = grid.addWidget(widgetHTML, 9, 7, 2, 3, true);
var $widget = $(widget); var $widget = $(widget);
expect(parseInt($widget.attr('data-gs-x'), 10)).not.toBe(6); expect(parseInt($widget.attr('data-gs-x'), 10)).not.toBe(6);
......
...@@ -1610,7 +1610,7 @@ ...@@ -1610,7 +1610,7 @@
} }
var heightData = Utils.parseHeight(val); var heightData = Utils.parseHeight(val);
if (this.opts.cellHeightUnit === heightData.heightUnit && this.opts.height === heightData.height) { if (this.opts.cellHeightUnit === heightData.unit && this.opts.cellHeight === heightData.height) {
return ; return ;
} }
this.opts.cellHeightUnit = heightData.unit; this.opts.cellHeightUnit = heightData.unit;
......
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