[Pkg-mozext-commits] [tabmixplus] 77/107: Add VariableDeclarator to Eslint indent rule, turn off some rules on session folder to prevent merge problem with other branches

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit ca50a8c2f2b6c1fcab450febe197509da49c4e82
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Nov 13 21:57:32 2015 +0200

    Add VariableDeclarator to Eslint indent rule, turn off some rules on session folder to prevent merge problem with other branches
---
 .eslintrc                               | 2 +-
 chrome/content/session/promptservice.js | 2 ++
 chrome/content/session/session.js       | 2 ++
 chrome/content/session/sessionStore.js  | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index 3117a36..2ec6306 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -163,7 +163,7 @@
         "func-style": [0, "declaration"],
         "guard-for-in": 0,
         "handle-callback-err": 0,
-        "indent": [2, 2, {"SwitchCase": 1}],
+        "indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": {"var": 2, "let": 2, "const": 3}}],
         "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
         "lines-around-comment": [0, {"beforeBlockComment": true, "allowBlockStart": true, "allowBlockEnd": true}],
         //XX error in Brackets - Eslint complain that first line is LF
diff --git a/chrome/content/session/promptservice.js b/chrome/content/session/promptservice.js
index 4496efd..4988110 100644
--- a/chrome/content/session/promptservice.js
+++ b/chrome/content/session/promptservice.js
@@ -1,3 +1,5 @@
+/* eslint indent: 0, brace-style: 0, no-case-declarations: 0, block-scoped-var: 0,
+          no-lonely-if: 0, consistent-this: 0 */
 /* exported TMP_BUTTON_OK, TMP_BUTTON_CANCEL, TMP_BUTTON_EXTRA1, TMP_SHOW_MENULIST,
             TMP_SHOW_TEXTBOX, TMP_HIDE_MENUANDTEXT, TMP_CHECKBOX_UNCHECKED,
             TMP_CHECKBOX_CHECKED, TMP_HIDE_CHECKBOX, TMP_SELECT_DEFAULT,
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index f3a49c8..c6bca40 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -1,3 +1,5 @@
+/* eslint indent: 0, brace-style: 0, no-case-declarations: 0, block-scoped-var: 0,
+          no-lonely-if: 0, consistent-this: 0 */
 /* exported TabmixConvertSession */
 "use strict";
 
diff --git a/chrome/content/session/sessionStore.js b/chrome/content/session/sessionStore.js
index 5fb2f00..2ed623d 100644
--- a/chrome/content/session/sessionStore.js
+++ b/chrome/content/session/sessionStore.js
@@ -1,3 +1,5 @@
+/* eslint indent: 0, brace-style: 0, no-case-declarations: 0, block-scoped-var: 0,
+          no-lonely-if: 0, consistent-this: 0 */
 "use strict";
 
 /*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git