Lint our JS code.

abilian · May 12, 2015 · 3455423 · 3455423
1 parent 8c59b19
commit 3455423
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 9 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,11 @@
+{
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "rules": {
+    "camelcase": false,
+    "no-trailing-spaces": false,
+    "quotes": 0
+  }
+}
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 .ropeproject
 *,cover
 
+node_modules
 env
 whoosh*
 abilian.db

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: test pep8 pylama clean docs tox
+.PHONY: test pep8 pylama clean docs tox jslint
 
 # The source director
 SRC=abilian
@@ -28,6 +28,10 @@ test-with-coverage:
 tox:
 	tox
 
+vagrant-tests:
+	vagrant up
+	vagrant ssh -c /vagrant/deploy/vagrant_test.sh
+
 #
 # Various Checkers
 #
@@ -52,13 +56,12 @@ pylama:
 pylint:
 	pylint --rcfile=etc/pylintrc $(SRC)
 
+jslint:
+	npm run lint --silent
+
 check-docs:
 	sphinx-build -W -b html docs/ docs/_build/html
 
-vagrant-tests:
-	vagrant up
-	vagrant ssh -c /vagrant/deploy/vagrant_test.sh
-
 #
 # Everything else
 #

diff --git a/abilian/web/resources/js/abilian.js b/abilian/web/resources/js/abilian.js
@@ -134,7 +134,7 @@
                  );
              }
          );
-     };
+     }
 
      function initLiveSearch() {
          var datasets = [];

diff --git a/abilian/web/resources/js/widgets/dynamic-row.js b/abilian/web/resources/js/widgets/dynamic-row.js
@@ -37,8 +37,8 @@
                 function() {
                     var item  = $(this);
                     var shortName = item.data("shortName");
-                    var name = self.prefix + '-' + self.current_index
-                    if(shortName) {
+                    var name = self.prefix + '-' + self.current_index;
+                    if (shortName) {
                         name =  name + '-' + shortName;
                     }
                     item.attr('name', name);

diff --git a/abilian/web/resources/js/widgets/file.js b/abilian/web/resources/js/widgets/file.js
@@ -24,7 +24,7 @@
         self.button.on('change.fileapi', 'input',
                        {fileinput: self},
                        self.addFiles);
-    };
+    }
 
     FileInput.prototype = {
         addFiles: function(evt) {

diff --git a/package.json b/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "abilian-core",
+  "repository": {
+    "type": "git",
+    "url": "TODO"
+  },
+  "description": "TODO",
+  "scripts": {
+    "prestart": "npm install",
+    "lint": "eslint abilian/web/resources/js/ --ext .js"
+  },
+  "dependencies": {
+  },
+  "devDependencies": {
+    "eslint": "^0.20.0"
+  }
+}