Thanks to visit codestin.com
Credit goes to github.com

Skip to content

more setColumn() tweaks #1103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2019
Merged

more setColumn() tweaks #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions demo/column.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,20 @@ <h1>setColumn() grid demo</h1>
];
var count = 0;
grid.batchUpdate();
for (count=0; count<3; count++) {
for (count=0; count<3;) {
var n = items[count];
grid.addWidget($('<div><div class="grid-stack-item-content">' + count + (n.text ? n.text : '') + '</div></div>'), n);
grid.addWidget($('<div><div class="grid-stack-item-content">' + count++ + (n.text ? n.text : '') + '</div></div>'), n);
};
grid.commit();

$('#add-widget').click(function() {
var n = items[count++] || {
var n = items[count] || {
x: Math.round(12 * Math.random()),
y: Math.round(5 * Math.random()),
width: Math.round(1 + 3 * Math.random()),
height: Math.round(1 + 3 * Math.random())
};
grid.addWidget($('<div><div class="grid-stack-item-content">' + count + (n.text ? n.text : '') + '</div></div>'), n);
grid.addWidget($('<div><div class="grid-stack-item-content">' + count++ + (n.text ? n.text : '') + '</div></div>'), n);
});

$('#1column').click(function() { grid.setColumn(1); });
Expand Down
13 changes: 7 additions & 6 deletions demo/float.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,24 @@ <h1>Float grid demo</h1>

new function () {
this.items = [
{x: 0, y: 6, width: 2, height: 2},
{x: 3, y: 1, width: 1, height: 2},
{x: 4, y: 2, width: 1, height: 1},
{x: 2, y: 5, width: 1, height: 1},
{x: 2, y: 3, width: 3, height: 1},
{x: 2, y: 5, width: 1, height: 1}
{x: 4, y: 2, width: 1, height: 1},
{x: 3, y: 1, width: 1, height: 2},
{x: 0, y: 6, width: 2, height: 2}
];
var count = 0;

this.grid = $('.grid-stack').data('gridstack');

this.addNewWidget = function() {
var node = this.items.pop() || {
var node = this.items[count] || {
x: Math.round(12 * Math.random()),
y: Math.round(5 * Math.random()),
width: Math.round(1 + 3 * Math.random()),
height: Math.round(1 + 3 * Math.random())
};
this.grid.addWidget($('<div><div class="grid-stack-item-content"></div></div>'), node);
this.grid.addWidget($('<div><div class="grid-stack-item-content">' + count++ + '</div></div>'), node);
return false;
}.bind(this);

Expand Down
156 changes: 94 additions & 62 deletions spec/gridstack-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,84 +328,116 @@ describe('gridstack', function() {
};
$('.grid-stack').gridstack(options);
var grid = $('.grid-stack').data('gridstack');
var node1 = $('#item1').data('_gridstack_node');
var node2 = $('#item2').data('_gridstack_node');
var el1 = $('#item1')
var el2 = $('#item2')

// items start at 4x2 and 4x4
expect(node1.x).toBe(0);
expect(node1.y).toBe(0);
expect(node1.width).toBe(4);
expect(node1.height).toBe(2);

expect(node2.x).toBe(4);
expect(node2.y).toBe(0);
expect(node2.width).toBe(4);
expect(node2.height).toBe(4);
expect(parseInt(el1.attr('data-gs-x'))).toBe(0);
expect(parseInt(el1.attr('data-gs-y'))).toBe(0);
expect(parseInt(el1.attr('data-gs-width'))).toBe(4);
expect(parseInt(el1.attr('data-gs-height'))).toBe(2);

expect(parseInt(el2.attr('data-gs-x'))).toBe(4);
expect(parseInt(el2.attr('data-gs-y'))).toBe(0);
expect(parseInt(el2.attr('data-gs-width'))).toBe(4);
expect(parseInt(el2.attr('data-gs-height'))).toBe(4);

// 1 column will have item1, item2
grid.setColumn(1);
node1 = $('#item1').data('_gridstack_node');
node2 = $('#item2').data('_gridstack_node');
expect(grid.opts.column).toBe(1);
expect(node1.x).toBe(0);
expect(node1.y).toBe(0);
expect(node1.width).toBe(1);
expect(node1.height).toBe(2);
expect(parseInt(el1.attr('data-gs-x'))).toBe(0);
expect(parseInt(el1.attr('data-gs-y'))).toBe(0);
expect(parseInt(el1.attr('data-gs-width'))).toBe(1);
expect(parseInt(el1.attr('data-gs-height'))).toBe(2);

expect(node2.x).toBe(0);
expect(node2.y).toBe(2);
expect(node2.width).toBe(1);
expect(node2.height).toBe(4);
expect(parseInt(el2.attr('data-gs-x'))).toBe(0);
expect(parseInt(el2.attr('data-gs-y'))).toBe(2);
expect(parseInt(el2.attr('data-gs-width'))).toBe(1);
expect(parseInt(el2.attr('data-gs-height'))).toBe(4);

// add default 1x1 item to the end (1 column)
var el3 = grid.addWidget(widgetHTML);
expect(el3).not.toBe(null);
var node3 = $(el3).data('_gridstack_node');
expect(node3.x).toBe(0);
expect(node3.y).toBe(6);
expect(node3.width).toBe(1);
expect(node3.height).toBe(1);
expect(parseInt(el3.attr('data-gs-x'))).toBe(0);
expect(parseInt(el3.attr('data-gs-y'))).toBe(6);
expect(parseInt(el3.attr('data-gs-width'))).toBe(1);
expect(parseInt(el3.attr('data-gs-height'))).toBe(1);

// 2 column will have item1, item2, item3 in 1 column still
grid.setColumn(2);
node1 = $('#item1').data('_gridstack_node');
node2 = $('#item2').data('_gridstack_node');
node3 = $('#item3').data('_gridstack_node');
expect(grid.opts.column).toBe(2);
expect(node1.x).toBe(0);
expect(node1.y).toBe(0);
expect(node1.width).toBe(1);
expect(node1.height).toBe(2);
// back to 12 column and initial layout (other than new item3)
grid.setColumn(12);
expect(grid.opts.column).toBe(12);
expect(parseInt(el1.attr('data-gs-x'))).toBe(0);
expect(parseInt(el1.attr('data-gs-y'))).toBe(0);
expect(parseInt(el1.attr('data-gs-width'))).toBe(4);
expect(parseInt(el1.attr('data-gs-height'))).toBe(2);

expect(parseInt(el2.attr('data-gs-x'))).toBe(4);
expect(parseInt(el2.attr('data-gs-y'))).toBe(0);
expect(parseInt(el2.attr('data-gs-width'))).toBe(4);
expect(parseInt(el2.attr('data-gs-height'))).toBe(4);

expect(parseInt(el3.attr('data-gs-x'))).toBe(0);
expect(parseInt(el3.attr('data-gs-y'))).toBe(6);
expect(parseInt(el3.attr('data-gs-width'))).toBe(1); // ??? could take entire width if it did above
expect(parseInt(el3.attr('data-gs-height'))).toBe(1);

// back to 1 column, move item2 to beginning to [3][1][2] vertically
grid.setColumn(1);
expect(grid.opts.column).toBe(1);
grid.move(el3, 0, 0);

expect(parseInt(el3.attr('data-gs-x'))).toBe(0);
expect(parseInt(el3.attr('data-gs-y'))).toBe(0);
expect(parseInt(el3.attr('data-gs-width'))).toBe(1);
expect(parseInt(el3.attr('data-gs-height'))).toBe(1);

expect(node2.x).toBe(1);
expect(node2.y).toBe(0);
expect(node2.width).toBe(1);
expect(node2.height).toBe(4);
expect(parseInt(el1.attr('data-gs-y'))).toBe(1);
expect(parseInt(el1.attr('data-gs-width'))).toBe(1);
expect(parseInt(el1.attr('data-gs-height'))).toBe(2);

expect(node3.x).toBe(0);
expect(node3.y).toBe(6);
expect(node3.width).toBe(1); // ??? could stay at 1 or take entire width still ?
expect(node3.height).toBe(1);
expect(parseInt(el2.attr('data-gs-x'))).toBe(0);
expect(parseInt(el2.attr('data-gs-y'))).toBe(3);
expect(parseInt(el2.attr('data-gs-width'))).toBe(1);
expect(parseInt(el2.attr('data-gs-height'))).toBe(4);

// back to 12 column and initial layout (other than new item3)
// back to 12 column, el3 to be beginning still, but [1][2] to be in 1 columns still but wide 4x2 and 4x still
grid.setColumn(12);
expect(grid.opts.column).toBe(12);
node1 = $('#item1').data('_gridstack_node');
node2 = $('#item2').data('_gridstack_node');
node3 = $('#item3').data('_gridstack_node');
expect(node1.x).toBe(0);
expect(node1.y).toBe(0);
expect(node1.width).toBe(4);
expect(node1.height).toBe(2);

expect(node2.x).toBe(4);
expect(node2.y).toBe(0);
expect(node2.width).toBe(4);
expect(node2.height).toBe(4);

expect(node3.x).toBe(0);
expect(node3.y).toBe(6);
expect(node3.width).toBe(6); // ??? could 6 or taken entire width if it did above
expect(node3.height).toBe(1);

expect(parseInt(el3.attr('data-gs-x'))).toBe(0);
expect(parseInt(el3.attr('data-gs-y'))).toBe(0);
expect(parseInt(el3.attr('data-gs-width'))).toBe(1);
expect(parseInt(el3.attr('data-gs-height'))).toBe(1);

expect(parseInt(el1.attr('data-gs-x'))).toBe(0);
expect(parseInt(el1.attr('data-gs-y'))).toBe(1);
expect(parseInt(el1.attr('data-gs-width'))).toBe(4);
expect(parseInt(el1.attr('data-gs-height'))).toBe(2);

expect(parseInt(el2.attr('data-gs-x'))).toBe(0);
expect(parseInt(el2.attr('data-gs-y'))).toBe(3);
expect(parseInt(el2.attr('data-gs-width'))).toBe(4);
expect(parseInt(el2.attr('data-gs-height'))).toBe(4);

// 2 column will have item1, item2, item3 in 1 column still but half the width
grid.setColumn(1); // test convert from small, should use 12 layout still
grid.setColumn(2);
expect(grid.opts.column).toBe(2);

expect(parseInt(el3.attr('data-gs-x'))).toBe(0);
expect(parseInt(el3.attr('data-gs-y'))).toBe(0);
expect(parseInt(el3.attr('data-gs-width'))).toBe(1); // 1 as we scaled from 12 columns
expect(parseInt(el3.attr('data-gs-height'))).toBe(1);

expect(parseInt(el1.attr('data-gs-x'))).toBe(0);
expect(parseInt(el1.attr('data-gs-y'))).toBe(1);
expect(parseInt(el1.attr('data-gs-width'))).toBe(1);
expect(parseInt(el1.attr('data-gs-height'))).toBe(2);

expect(parseInt(el2.attr('data-gs-x'))).toBe(0);
expect(parseInt(el2.attr('data-gs-y'))).toBe(3);
expect(parseInt(el2.attr('data-gs-width'))).toBe(1);
expect(parseInt(el2.attr('data-gs-height'))).toBe(4);
});
});

Expand Down
Loading