aboutsummaryrefslogtreecommitdiff
path: root/lib/docx
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-06-28 21:51:50 +0100
committerMichael Williamson <mike@zwobble.org>2016-06-28 21:51:50 +0100
commit4b13398d9f4fc303d22fc24aac519113941b032c (patch)
tree7422aa51b30de16ff9a90fb8863f1503ef755642 /lib/docx
parentd046c4297a04b6eecadf01093382b72bb1b71032 (diff)
Add stylistic eslint rules
Diffstat (limited to 'lib/docx')
-rw-r--r--lib/docx/body-reader.js9
-rw-r--r--lib/docx/docx-reader.js2
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/docx/body-reader.js b/lib/docx/body-reader.js
index 71ad29d..c338893 100644
--- a/lib/docx/body-reader.js
+++ b/lib/docx/body-reader.js
@@ -232,7 +232,7 @@ function BodyReader(options) {
var properties = element.firstOrEmpty("w:tcPr");
var gridSpan = properties.firstOrEmpty("w:gridSpan").attributes["w:val"];
- var colSpan = gridSpan ? parseInt(gridSpan) : 1;
+ var colSpan = gridSpan ? parseInt(gridSpan, 10) : 1;
var cell = documents.TableCell(children, {colSpan: colSpan});
cell._vMerge = readVMerge(properties);
@@ -408,7 +408,6 @@ function joinZipPath(first, second) {
}
-
function emptyResultWithMessages(messages) {
return new ReadResult(null, null, messages);
}
@@ -466,7 +465,7 @@ function combineResults(results) {
var result = Result.combine(_.pluck(results, "_result"));
return new ReadResult(
_.flatten(_.pluck(result.value, "element")),
- _.filter(_.flatten(_.pluck(result.value, "extra")), function(x) { return x; }),
+ _.filter(_.flatten(_.pluck(result.value, "extra")), identity),
result.messages
);
}
@@ -474,3 +473,7 @@ function combineResults(results) {
function joinElements(first, second) {
return _.flatten([first, second]);
}
+
+function identity(value) {
+ return value;
+}
diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js
index 8ef4960..6ad63ab 100644
--- a/lib/docx/docx-reader.js
+++ b/lib/docx/docx-reader.js
@@ -57,7 +57,7 @@ function read(docxFile, input) {
bodyReader: bodyReader,
notes: notes
});
- return reader.convertXmlToDocument(xml);
+ return reader.convertXmlToDocument(xml);
});
});
});