Freeboard
/
freeboard
mirror of https://github.com/Freeboard/freeboard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed some issues with column sizing

gh-pages
Jim Heising 2014-09-05 14:39:18 -07:00
parent 5b6e69826f
commit 7e29d27a6b
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/freeboard+plugins.js
View File

@ -668,6 +668,7 @@ function FreeboardUI()
function processResize(layoutWidgets)
{
var maxDisplayableColumns = getMaxDisplayableColumnCount();
var repositionFunction = function(){};
if(layoutWidgets)
{
@ -677,12 +678,13 @@ function FreeboardUI()
var viewModel = ko.dataFor(paneElement);
var newPosition = getPositionForScreenSize(viewModel);
$(paneElement).attr("data-row", newPosition.row)
$(paneElement).attr("data-sizex", Math.min(viewModel.col_width(), maxDisplayableColumns))
.attr("data-row", newPosition.row)
.attr("data-col", newPosition.col);
}
}
updateGridWidth(Math.min(getMaxDisplayableColumnCount(), userColumns));
updateGridWidth(Math.min(maxDisplayableColumns, userColumns));
repositionGrid(repositionFunction);
updateGridColumnControls();

2
js/freeboard+plugins.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
js/freeboard.js
View File

@ -668,6 +668,7 @@ function FreeboardUI()
function processResize(layoutWidgets)
{
var maxDisplayableColumns = getMaxDisplayableColumnCount();
var repositionFunction = function(){};
if(layoutWidgets)
{
@ -677,12 +678,13 @@ function FreeboardUI()
var viewModel = ko.dataFor(paneElement);
var newPosition = getPositionForScreenSize(viewModel);
$(paneElement).attr("data-row", newPosition.row)
$(paneElement).attr("data-sizex", Math.min(viewModel.col_width(), maxDisplayableColumns))
.attr("data-row", newPosition.row)
.attr("data-col", newPosition.col);
}
}
updateGridWidth(Math.min(getMaxDisplayableColumnCount(), userColumns));
updateGridWidth(Math.min(maxDisplayableColumns, userColumns));
repositionGrid(repositionFunction);
updateGridColumnControls();

2
js/freeboard.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
lib/js/freeboard/FreeboardUI.js
View File

@ -12,6 +12,7 @@ function FreeboardUI()
function processResize(layoutWidgets)
{
var maxDisplayableColumns = getMaxDisplayableColumnCount();
var repositionFunction = function(){};
if(layoutWidgets)
{
@ -21,12 +22,13 @@ function FreeboardUI()
var viewModel = ko.dataFor(paneElement);
var newPosition = getPositionForScreenSize(viewModel);
$(paneElement).attr("data-row", newPosition.row)
$(paneElement).attr("data-sizex", Math.min(viewModel.col_width(), maxDisplayableColumns))
.attr("data-row", newPosition.row)
.attr("data-col", newPosition.col);
}
}
updateGridWidth(Math.min(getMaxDisplayableColumnCount(), userColumns));
updateGridWidth(Math.min(maxDisplayableColumns, userColumns));
repositionGrid(repositionFunction);
updateGridColumnControls();