From ff3e56e88fa74ac6190e90c964b2d570b51b8059 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 11 Jul 2014 11:17:48 +0100
Subject: [PATCH] Issue #2299269 by nod_: Update eslint configuration for 0.7.4
version.
---
.eslintignore | 6 +++---
.eslintrc | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.eslintignore b/.eslintignore
index a04f7ea215e0..a43f4ca913c8 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,5 @@
-core/assets/vendor/*
+core/assets/vendor/**/*
core/modules/locale/tests/locale_test.js
core/modules/tour/js/jquery.joyride-2.0.3.js
-core/vendor/*
-sites/*/files
+core/vendor/**/*
+sites/**/files/**/*
diff --git a/.eslintrc b/.eslintrc
index b33ca06a81aa..97ff8623efed 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -16,9 +16,10 @@
"rules": {
"eqeqeq": [2, "smart"],
"guard-for-in": 2,
+ "no-mixed-spaces-and-tabs": 2,
+ "no-trailing-spaces": 2,
"no-undef": 2,
- //"no-unused-vars": [2, {"vars": "local", "args": "none"}],
- "no-unused-vars": 0,
+ "no-unused-vars": [2, {"vars": "local", "args": "none"}],
"strict": 2,
"new-cap": 0,
"quotes": 0,
--
GitLab