Browse Source

[emacs] .dir-locals.el: add setup for js-mode

- move jshint option from gruntfile to .jshintrc
- remove trailing-whitespace from gruntfile and
- add jshint esversion: 6
- .dir-locals.el add locals for js-mode to use JSHint from the simple theme

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Markus Heiser 3 years ago
parent
commit
a3f58a3a3d
3 changed files with 20 additions and 11 deletions
  1. 9 0
      .dir-locals.el
  2. 8 0
      searx/static/themes/simple/.jshintrc
  3. 3 11
      searx/static/themes/simple/gruntfile.js

+ 9 - 0
.dir-locals.el

@@ -88,6 +88,15 @@
                (setq-local js-indent-level 2)
                (flycheck-checker . json-python-json)))))
 
+ (js-mode
+  . ((eval . (progn
+               (setq-local js-indent-level 2)
+               ;; flycheck should use the jshint checker from simple theme
+               (setq-local flycheck-javascript-jshint-executable
+                           (expand-file-name "searx/static/themes/simple/node_modules/.bin/jshint" prj-root))
+               (flycheck-mode)
+               ))))
+
  (python-mode
   . ((eval . (progn
 

+ 8 - 0
searx/static/themes/simple/.jshintrc

@@ -0,0 +1,8 @@
+{
+  "proto": true,
+  "globals": {
+    "browser": true,
+    "jQuery": false,
+    "devel": true
+  }
+}

+ 3 - 11
searx/static/themes/simple/gruntfile.js

@@ -1,3 +1,5 @@
+/*jshint esversion: 6 */
+
 module.exports = function(grunt) {
 
   const path = require('path');
@@ -12,16 +14,6 @@ module.exports = function(grunt) {
     },
     jshint: {
       files: ['src/js/main/*.js', 'src/js/head/*.js', '../__common__/js/*.js'],
-      options: {
-        reporterOutput: "",
-        proto: true,
-        // options here to override JSHint defaults
-        globals: {
-          browser: true,
-          jQuery: false,
-          devel: true
-        }
-      }
     },
     stylelint: {
       options: {
@@ -122,7 +114,7 @@ module.exports = function(grunt) {
           'node_modules/ionicons-npm/src/ion-close-round.svg',
           'node_modules/ionicons-npm/src/android-more-vertical.svg',
           'src/fonts/magnet.svg',
-          'node_modules/ionicons-npm/src/android-close.svg',	  
+          'node_modules/ionicons-npm/src/android-close.svg',
         ],
         dest: 'fonts',
         destLess: 'src/generated',