fix colSpan preparing

bpampuch · Jun 1, 2017 · e0e4e13 · e0e4e13
1 parent d5f951f
commit e0e4e13
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/docMeasure.js b/src/docMeasure.js
@@ -518,6 +518,14 @@ DocMeasure.prototype.measureTable = function (node) {
 		for (row = 0, rows = node.table.body.length; row < rows; row++) {
 			var rowData = node.table.body[row];
 			var data = rowData[col];
+			if (data === undefined) {
+				console.error('Malformed table row ', rowData, 'in node ', node);
+				throw 'Malformed table row, a cell is undefined.';
+			}
+			if (data === null) { // transform to object
+				data = '';
+			}
+
 			if (!data._span) {
 				data = rowData[col] = this.styleStack.auto(data, measureCb(this, data));
 

diff --git a/src/docPreprocessor.js b/src/docPreprocessor.js
@@ -88,15 +88,13 @@ DocPreprocessor.prototype.preprocessTable = function (node) {
 		for (row = 0, rows = node.table.body.length; row < rows; row++) {
 			var rowData = node.table.body[row];
 			var data = rowData[col];
-			if (data === undefined) {
-				console.error('Malformed table row ', rowData, 'in node ', node);
-				throw 'Malformed table row, a cell is undefined.';
-			}
-			if (data === null) { // transform to object
-				data = '';
-			}
+			if (data !== undefined) {
+				if (data === null) { // transform to object
+					data = '';
+				}
 
-			rowData[col] = this.preprocessNode(data);
+				rowData[col] = this.preprocessNode(data);
+			}
 		}
 	}