Conditional formatting fix when set for the row without columns

nikitaeverywhere · nikitaeverywhere · commit 31a32ad80668 · 2016-09-17T20:44:26.000+03:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "LightPivotTable",
   "author": "ZitRo",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
   "main": "test/testServer.js",
   "repository": {
diff --git a/source/js/PivotView.js b/source/js/PivotView.js
@@ -664,7 +664,8 @@ PivotView.prototype.applyConditionalFormatting = function (rules, key, value, el
         p, i, rule, html, xs, num;
     actualRules = actualRules.concat(rules[key] || []);
     if ((xs = key.split(",")).length === 2) {
-        actualRules = actualRules.concat(rules[xs[0] + ","] || [], rules["," + xs[1]] || []);
+        actualRules = actualRules.concat(rules[xs[0]] || [], rules[xs[0] + ","] || [],
+            rules["," + xs[1]] || []);
     }
 
     for (p in actualRules) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "LightPivotTable",`
`3`	`3`	`"author": "ZitRo",`
`4`		`- "version": "1.6.8",`
	`4`	`+ "version": "1.6.9",`
`5`	`5`	`"description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",`
`6`	`6`	`"main": "test/testServer.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,8 @@ PivotView.prototype.applyConditionalFormatting = function (rules, key, value, el`
`664`	`664`	`p, i, rule, html, xs, num;`
`665`	`665`	`actualRules = actualRules.concat(rules[key] \|\| []);`
`666`	`666`	`if ((xs = key.split(",")).length === 2) {`
`667`		`- actualRules = actualRules.concat(rules[xs[0] + ","] \|\| [], rules["," + xs[1]] \|\| []);`
	`667`	`+ actualRules = actualRules.concat(rules[xs[0]] \|\| [], rules[xs[0] + ","] \|\| [],`
	`668`	`+ rules["," + xs[1]] \|\| []);`
`668`	`669`	`}`
`669`	`670`
`670`	`671`	`for (p in actualRules) {`