Merge pull request #384 from thelounge/xpaw/eslint
Update eslint and enforce key-spacing
This commit is contained in:
commit
31e7ef2b69
@ -14,9 +14,11 @@ rules:
|
|||||||
curly: [2, all]
|
curly: [2, all]
|
||||||
eqeqeq: 2
|
eqeqeq: 2
|
||||||
indent: [2, tab]
|
indent: [2, tab]
|
||||||
|
key-spacing: [2, {beforeColon: false, afterColon: true}]
|
||||||
keyword-spacing: [2, {before: true, after: true}]
|
keyword-spacing: [2, {before: true, after: true}]
|
||||||
linebreak-style: [2, unix]
|
linebreak-style: [2, unix]
|
||||||
no-console: 0
|
no-console: 0
|
||||||
|
no-control-regex: 0
|
||||||
no-inner-declarations: 2
|
no-inner-declarations: 2
|
||||||
no-invalid-regexp: 2
|
no-invalid-regexp: 2
|
||||||
no-irregular-whitespace: 2
|
no-irregular-whitespace: 2
|
||||||
|
@ -7,7 +7,7 @@ Handlebars.registerHelper(
|
|||||||
"@": "op",
|
"@": "op",
|
||||||
"%": "half-op",
|
"%": "half-op",
|
||||||
"+": "voice",
|
"+": "voice",
|
||||||
"" : "normal"
|
"": "normal"
|
||||||
};
|
};
|
||||||
return modes[mode];
|
return modes[mode];
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
$(function() {
|
$(function() {
|
||||||
var path = window.location.pathname + "socket.io/";
|
var path = window.location.pathname + "socket.io/";
|
||||||
var socket = io({path:path});
|
var socket = io({path: path});
|
||||||
var commands = [
|
var commands = [
|
||||||
"/close",
|
"/close",
|
||||||
"/connect",
|
"/connect",
|
||||||
|
@ -56,7 +56,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"chai": "3.5.0",
|
"chai": "3.5.0",
|
||||||
"eslint": "2.8.0",
|
"eslint": "2.11.1",
|
||||||
"font-awesome": "4.6.3",
|
"font-awesome": "4.6.3",
|
||||||
"grunt": "1.0.1",
|
"grunt": "1.0.1",
|
||||||
"grunt-contrib-uglify": "1.0.1",
|
"grunt-contrib-uglify": "1.0.1",
|
||||||
|
@ -257,7 +257,7 @@ Client.prototype.connect = function(args) {
|
|||||||
|
|
||||||
Client.prototype.setPassword = function(hash) {
|
Client.prototype.setPassword = function(hash) {
|
||||||
var client = this;
|
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
|
// 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
|
// prevent situations where the password failed to save properly and so
|
||||||
// a restart of the server would forget the change and use the old
|
// a restart of the server would forget the change and use the old
|
||||||
|
Loading…
Reference in New Issue
Block a user