Better eslint

catalyticlabs · Jan 23, 2016 · 6e6dc95 · 6e6dc95
1 parent dad3e3f
commit 6e6dc95
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,5 +1,9 @@
 {
   "parser": "babel-eslint",
+  "globals":{
+    "saveAs": true,
+    "JSZipUtils": true
+  },
   "env": {
     "node": true,
     "browser": true,

diff --git a/es6/docxgenTest.js b/es6/docxgenTest.js
@@ -51,6 +51,7 @@ var expectToThrow = function (obj, method, type, expectedError) {
 	expect(e.properties, toShowOnFail).to.have.property("id");
 	expect(e.properties.id, toShowOnFail).to.be.a("string");
 	delete e.properties.explanation;
+	delete e.stack;
 	return expect(JSON.parse(JSON.stringify(e))).to.be.deep.equal(expectedError);
 };
 

diff --git a/es6/xmlTemplater.js b/es6/xmlTemplater.js
@@ -292,14 +292,16 @@ module.exports = class XmlTemplater {
 			this.currentCompiledTag = new CompiledXmlTag([this.templaterState.getLeftValue(), {type: "tag", tag: this.templaterState.textInsideTag}, this.templaterState.getRightValue()]);
 			options.insideValue = this.templaterState.getLeftValue() + newValue + this.templaterState.getRightValue();
 			return this.replaceXmlTag(content, options);
-		// <w>{aaa</w> ... <w> aaa} </w>
 		}
+		// <w>{aaa</w> ... <w> aaa} </w>
 		else if (this.templaterState.tagEnd.numXmlTag > this.templaterState.tagStart.numXmlTag) {
 			// 1. for the first (@templaterState.tagStart.numXmlTag): replace **{tag by **tagValue
 
 			options.insideValue = newValue;
 			this.currentCompiledTag = new CompiledXmlTag([{type: "tag", tag: this.templaterState.textInsideTag}]);
-			if (!(this.templaterState.matches[this.templaterState.tagStart.numXmlTag].first != null) && !(this.templaterState.matches[this.templaterState.tagStart.numXmlTag].last != null)) { // normal case
+
+			// normal case
+			if (!(this.templaterState.matches[this.templaterState.tagStart.numXmlTag].first != null) && !(this.templaterState.matches[this.templaterState.tagStart.numXmlTag].last != null)) {
 				this.currentCompiledTag = new CompiledXmlTag([this.templaterState.getLeftValue(), {type: "tag", tag: this.templaterState.textInsideTag}]);
 				options.insideValue = this.templaterState.getLeftValue() + newValue;
 			}

diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "browserify": "npm run browserify:test && npm run browserify:lib",
     "convertto:es5": "rm js -rf ; mkdir -p test/spec; mkdir -p js; babel es6 --out-dir js; mv js/docxgenTest.js test/spec/docxgenTest.spec.js",
     "test:watch": "mocha test/spec/docxgenTest.spec.js -w",
+    "lint": "bash -c 'eslint . --ignore-path <(cat .gitignore .eslintignore)'",
     "test": "mocha test/spec/docxgenTest.spec.js"
   }
 }