From 2ffd85d89f1722ab14cfd8f478164cb7b63732c3 Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Sun, 5 Jun 2016 21:48:34 +0300 Subject: [PATCH] Update eslint and enforce key-spacing --- .eslintrc.yml | 2 ++ client/js/libs/handlebars/modes.js | 2 +- client/js/lounge.js | 2 +- package.json | 2 +- src/client.js | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 68816521..971713e2 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -14,9 +14,11 @@ rules: curly: [2, all] eqeqeq: 2 indent: [2, tab] + key-spacing: [2, {beforeColon: false, afterColon: true}] keyword-spacing: [2, {before: true, after: true}] linebreak-style: [2, unix] no-console: 0 + no-control-regex: 0 no-inner-declarations: 2 no-invalid-regexp: 2 no-irregular-whitespace: 2 diff --git a/client/js/libs/handlebars/modes.js b/client/js/libs/handlebars/modes.js index 47ccb69e..f2907846 100644 --- a/client/js/libs/handlebars/modes.js +++ b/client/js/libs/handlebars/modes.js @@ -7,7 +7,7 @@ Handlebars.registerHelper( "@": "op", "%": "half-op", "+": "voice", - "" : "normal" + "": "normal" }; return modes[mode]; } diff --git a/client/js/lounge.js b/client/js/lounge.js index 3354d4fd..6f04b777 100644 --- a/client/js/lounge.js +++ b/client/js/lounge.js @@ -1,6 +1,6 @@ $(function() { var path = window.location.pathname + "socket.io/"; - var socket = io({path:path}); + var socket = io({path: path}); var commands = [ "/close", "/connect", diff --git a/package.json b/package.json index 7b254d8a..fff69c96 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ }, "devDependencies": { "chai": "3.5.0", - "eslint": "2.8.0", + "eslint": "2.11.1", "font-awesome": "4.6.3", "grunt": "1.0.1", "grunt-contrib-uglify": "1.0.1", diff --git a/src/client.js b/src/client.js index 98653ba7..f0641e8e 100644 --- a/src/client.js +++ b/src/client.js @@ -257,7 +257,7 @@ Client.prototype.connect = function(args) { Client.prototype.setPassword = function(hash) { var client = this; - client.manager.updateUser(client.name, {password:hash}); + client.manager.updateUser(client.name, {password: hash}); // re-read the hash off disk to ensure we use whatever is saved. this will // prevent situations where the password failed to save properly and so // a restart of the server would forget the change and use the old