Skip to content

Commit 688d4c9

Browse files
Undo last change
1 parent d67db5a commit 688d4c9

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "LightPivotTable",
33
"author": "ZitRo",
4-
"version": "1.8.9",
4+
"version": "1.8.10",
55
"description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
66
"main": "test/testServer.js",
77
"repository": {

source/js/DataController.js

+7-18
Original file line numberDiff line numberDiff line change
@@ -434,22 +434,13 @@ DataController.prototype.resetRawData = function () {
434434

435435
};
436436

437-
var applyHeaderStyle = function (cellObject, isHorizontal, previousHeaders) {
437+
var applyHeaderStyle = function (cellObject, isHorizontal) {
438438
if (!_.controller.CONFIG["pivotProperties"]) return;
439439
if (_.controller.CONFIG["pivotProperties"]["columnHeaderStyle"] && isHorizontal) {
440-
cellObject.style =
441-
_.controller.CONFIG["pivotProperties"]["columnHeaderStyle"] + cellObject.style;
440+
cellObject.style = _.controller.CONFIG["pivotProperties"]["columnHeaderStyle"];
442441
} else if (_.controller.CONFIG["pivotProperties"]["rowHeaderStyle"] && !isHorizontal) {
443-
cellObject.style =
444-
_.controller.CONFIG["pivotProperties"]["rowHeaderStyle"] + cellObject.style;
442+
cellObject.style = _.controller.CONFIG["pivotProperties"]["rowHeaderStyle"];
445443
}
446-
if (typeof previousHeaders === "undefined")
447-
return;
448-
var prevStyles = previousHeaders.reduce(
449-
function (acc, h) { return acc + (h.style || "") }, ""
450-
);
451-
if (prevStyles)
452-
cellObject.style += prevStyles;
453444
};
454445

455446
var getMaxLevel = function (children, level) {
@@ -498,20 +489,18 @@ DataController.prototype.resetRawData = function () {
498489
group: cnum,
499490
source: c[i],
500491
isCaption: true,
501-
value: c[i].caption || "",
502-
style: c[i].style || ""
492+
value: c[i].caption || ""
503493
};
504-
applyHeaderStyle(obj, hor, arr);
494+
applyHeaderStyle(obj, hor);
505495
dim1raw(a, c[i].children, arr.concat(obj), hor, level? level + 1 : level, maxLevel);
506496
} else {
507497
obj = {
508498
group: groupNum,
509499
source: c[i],
510500
isCaption: true,
511-
value: c[i].caption || "",
512-
style: c[i].style || ""
501+
value: c[i].caption || ""
513502
};
514-
applyHeaderStyle(obj, hor, arr);
503+
applyHeaderStyle(obj, hor);
515504
a.push(c[i]["type"] === "msr" && MEASURES_HIDDEN ? arr : arr.concat(obj));
516505
groupNum++;
517506
}

0 commit comments

Comments
 (0)