Skip to content

Commit

Permalink
resizing beta fix for FF/IE
Browse files Browse the repository at this point in the history
  • Loading branch information
nikitaeverywhere committed Feb 22, 2015
1 parent 606e5ec commit f5bc548
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "LightPivotTable",
"author": "ZitRo",
"version": "1.0.0-beta.12",
"version": "1.0.0-beta.13",
"description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
"main": "test/testServer.js",
"repository": {
Expand Down
21 changes: 14 additions & 7 deletions source/js/PivotView.js
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,8 @@ PivotView.prototype.recalculateSizes = function (container) {
tTableHead.childNodes[0].appendChild(tr);
};

headerContainer.style.width = headerW + "px";
topHeader.style.marginLeft = headerW + "px";
//return;
//console.log(lTableHead.offsetHeight, pTableHead.offsetHeight, bodyHeight, this.SCROLLBAR_WIDTH);
if (hasVerticalScrollBar && tTableHead.childNodes[0]) {
applyExtraTopHeadCell();
Expand Down Expand Up @@ -576,13 +577,19 @@ PivotView.prototype.recalculateSizes = function (container) {
if (mainHeaderWidth > headerW) leftHeader.style.width = mainHeaderWidth + "px";
tableBlock.style.height = containerHeight - headerH - pagedHeight + "px";
headerContainer.style.height = headerH + "px";
headerContainer.style.width = headerW + "px";

for (i in container["_primaryRows"]) {
container["_primaryRows"][i].style.height = columnHeights[i] + "px";
}
for (i in container["_primaryColumns"]) {
container["_primaryColumns"][i].style.width = cellWidths[i] + "px";
}
// @TEST beta.13
//for (i in container["_primaryRows"]) {
// container["_primaryRows"][i].style.height = columnHeights[i] + "px";
//}
//for (i in container["_primaryColumns"]) {
// container["_primaryColumns"][i].style.width = cellWidths[i] + "px";
//}

//console.log(cellWidths);
//containerParent.appendChild(container); // attach
//return;

if (addEggs) { // horScroll?
tr = document.createElement("tr");
Expand Down

0 comments on commit f5bc548

Please sign in to comment.