version bump 0.12.10: sheet_to_json niggle

- default not treated as value for empty rows (fixes SheetJS#1078 h/t @cemremengu)
nawgz · Apr 20, 2018 · f032f34 · f032f34
1 parent 6916d5f
commit f032f34
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 42 deletions.
diff --git a/bits/01_version.js b/bits/01_version.js
@@ -1 +1 @@
-XLSX.version = '0.12.9';
+XLSX.version = '0.12.10';
diff --git a/bits/90_utils.js b/bits/90_utils.js
@@ -51,7 +51,7 @@ function sheet_to_json(sheet/*:Worksheet*/, opts/*:?Sheet2JSONOpts*/) {
 			val = dense ? sheet[R][C] : sheet[cols[C] + rr];
 			if(val === undefined || val.t === undefined) {
 				if(defval === undefined) continue;
-				if(hdr[C] != null) { row[hdr[C]] = defval; isempty = false; }
+				if(hdr[C] != null) { row[hdr[C]] = defval; }
 				continue;
 			}
 			v = val.v;
@@ -69,7 +69,7 @@ function sheet_to_json(sheet/*:Worksheet*/, opts/*:?Sheet2JSONOpts*/) {
 				} else {
 					row[hdr[C]] = raw ? v : format_cell(val,v,o);
 				}
-				isempty = false;
+				if(v != null) isempty = false;
 			}
 		}
 		if((isempty === false) || (header === 1 ? o.blankrows !== false : !!o.blankrows)) out[outi++] = row;

diff --git a/dist/xlsx.core.min.js b/dist/xlsx.core.min.js
diff --git a/dist/xlsx.core.min.map b/dist/xlsx.core.min.map
diff --git a/dist/xlsx.extendscript.js b/dist/xlsx.extendscript.js
diff --git a/dist/xlsx.full.min.js b/dist/xlsx.full.min.js
diff --git a/dist/xlsx.full.min.map b/dist/xlsx.full.min.map
diff --git a/dist/xlsx.js b/dist/xlsx.js
diff --git a/dist/xlsx.min.js b/dist/xlsx.min.js
diff --git a/dist/xlsx.min.map b/dist/xlsx.min.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xlsx",
-	"version": "0.12.9",
+	"version": "0.12.10",
 	"author": "sheetjs",
 	"description": "SheetJS Spreadsheet data parser and writer",
 	"keywords": [

diff --git a/test.js b/test.js
@@ -865,7 +865,7 @@ describe('parse features', function() {
 				assert.equal(get_cell(ws, "B1").c[0].t, "Yegor Kozlov:\nfirst cell", "must have the concatenated texts");
 				if(i > 0) return;
 				assert.equal(get_cell(ws, "B1").c[0].r, '<r><rPr><b/><sz val="8"/><color indexed="81"/><rFont val="Tahoma"/></rPr><t>Yegor Kozlov:</t></r><r><rPr><sz val="8"/><color indexed="81"/><rFont val="Tahoma"/></rPr><t xml:space="preserve">\r\nfirst cell</t></r>', "must have the rich text representation");
-				assert.equal(get_cell(ws, "B1").c[0].h, '<span style="font-size:8;"><b>Yegor Kozlov:</b></span><span style="font-size:8;"><br/>first cell</span>', "must have the html representation");
+				assert.equal(get_cell(ws, "B1").c[0].h, '<span style="font-size:8pt;"><b>Yegor Kozlov:</b></span><span style="font-size:8pt;"><br/>first cell</span>', "must have the html representation");
 			});
 		});
 		[

diff --git a/tests/core.js b/tests/core.js
diff --git a/xlsx.flow.js b/xlsx.flow.js
@@ -4,7 +4,7 @@
 /*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
 var XLSX = {};
 (function make_xlsx(XLSX){
-XLSX.version = '0.12.9';
+XLSX.version = '0.12.10';
 var current_codepage = 1200, current_ansi = 1252;
 /*:: declare var cptable:any; */
 /*global cptable:true */
@@ -19584,7 +19584,7 @@ function sheet_to_json(sheet/*:Worksheet*/, opts/*:?Sheet2JSONOpts*/) {
 			val = dense ? sheet[R][C] : sheet[cols[C] + rr];
 			if(val === undefined || val.t === undefined) {
 				if(defval === undefined) continue;
-				if(hdr[C] != null) { row[hdr[C]] = defval; isempty = false; }
+				if(hdr[C] != null) { row[hdr[C]] = defval; }
 				continue;
 			}
 			v = val.v;
@@ -19602,7 +19602,7 @@ function sheet_to_json(sheet/*:Worksheet*/, opts/*:?Sheet2JSONOpts*/) {
 				} else {
 					row[hdr[C]] = raw ? v : format_cell(val,v,o);
 				}
-				isempty = false;
+				if(v != null) isempty = false;
 			}
 		}
 		if((isempty === false) || (header === 1 ? o.blankrows !== false : !!o.blankrows)) out[outi++] = row;

diff --git a/xlsx.js b/xlsx.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		XLSX.version = '0.12.9';
		XLSX.version = '0.12.10';