From f46f7e1e74439a19c0e4aba7b90557534bbae6f1 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 20 Dec 2016 10:34:40 +0200 Subject: [PATCH] chore(eslint) add indentation rule --- .eslintrc | 3 +++ bin/legacy.js | 12 ++++++------ lib/server/markdown.js | 36 ++++++++++++++++++------------------ lib/server/route.js | 6 +++--- test/lib/cloudfunc.js | 8 ++++---- test/rest/pack.js | 12 ++++++------ 6 files changed, 40 insertions(+), 37 deletions(-) diff --git a/.eslintrc b/.eslintrc index c9e626c8..3e7ab532 100644 --- a/.eslintrc +++ b/.eslintrc @@ -7,5 +7,8 @@ "ecmaVersion": 6, "sourceType": "module" }, + "rules": { + "indent": ["error", 4] + }, "extends": ["eslint:recommended"] } diff --git a/bin/legacy.js b/bin/legacy.js index cf282e70..ca4d8f00 100755 --- a/bin/legacy.js +++ b/bin/legacy.js @@ -9,7 +9,7 @@ const dir = path.join(__dirname, '../lib/server'); const _dir = path.join(__dirname, '../legacy/lib/server'); const setDir = (name) => { - return path.join(_dir, name); + return path.join(_dir, name); }; @@ -18,13 +18,13 @@ fs.readdirSync(dir) .map(writeFile); function fillFile(name) { - return { - name: setDir(name), - data: `module.exports = require(\'../../../lib_/server/${name}\');` - } + return { + name: setDir(name), + data: `module.exports = require(\'../../../lib_/server/${name}\');` + } } function writeFile({name, data}) { - return fs.writeFileSync(name, data); + return fs.writeFileSync(name, data); } diff --git a/lib/server/markdown.js b/lib/server/markdown.js index 4d3844c0..75ac9d1c 100644 --- a/lib/server/markdown.js +++ b/lib/server/markdown.js @@ -16,30 +16,30 @@ module.exports = (name, request, callback) => { check(name, request, callback); switch(method) { - case 'GET': - name = name.replace('/markdown', ''); + case 'GET': + name = name.replace('/markdown', ''); - if (query === 'relative') - name = DIR_ROOT + name; - else + if (query === 'relative') + name = DIR_ROOT + name; + else name = root(name); - fs.readFile(name, 'utf8', (error, data) => { - if (error) - return callback(error); + fs.readFile(name, 'utf8', (error, data) => { + if (error) + return callback(error); - parse(data, callback); - }); - break; + parse(data, callback); + }); + break; - case 'PUT': - pullout(request, 'string', (error, data) => { - if (error) - return callback(error); + case 'PUT': + pullout(request, 'string', (error, data) => { + if (error) + return callback(error); - parse(data, callback); - }); - break; + parse(data, callback); + }); + break; } }; diff --git a/lib/server/route.js b/lib/server/route.js index 9a97ed4b..c89803e4 100644 --- a/lib/server/route.js +++ b/lib/server/route.js @@ -86,11 +86,11 @@ function indexProcessing(options) { .replace('icon-copy', 'icon-copy none'); if (noConfig) - data = data + data = data .replace('icon-config', 'icon-config none'); if (noConsole) - data = data + data = data .replace('icon-console', 'icon-console none'); left = rendy(Template.panel, { @@ -231,7 +231,7 @@ function buildIndex(json, callback) { callback(error, data); }); }, (callback) => { - minify(PATH_INDEX, 'name', callback); + minify(PATH_INDEX, 'name', callback); }); } diff --git a/test/lib/cloudfunc.js b/test/lib/cloudfunc.js index 799fb8c3..5d256581 100644 --- a/test/lib/cloudfunc.js +++ b/test/lib/cloudfunc.js @@ -54,7 +54,7 @@ var DIR = __dirname + '/../../', ''; test(function(t) { - var paths = {}, + var paths = {}, filesList = TMPL_PATH.map(function(name) { var path = FS_DIR + name + '.hbs'; @@ -109,9 +109,9 @@ test(function(t) { 'Expect: {{ expect }}', 'Result: {{ result }}' ].join('\n'), { - number: i, - expect: Expect.substr(i), - result: result.substr(i) + number: i, + expect: Expect.substr(i), + result: result.substr(i) })); console.log('buildFromJSON: Not OK'); diff --git a/test/rest/pack.js b/test/rest/pack.js index 971fb7e9..273e157f 100644 --- a/test/rest/pack.js +++ b/test/rest/pack.js @@ -219,12 +219,12 @@ test('cloudcmd: rest: pack: zip: put: error', (t) => { function getPackOptions(port, to, names = ['pack']) { return { - url: `http://localhost:${port}/api/v1/pack`, - json: { - to, - names, - from: '/fixture', - } + url: `http://localhost:${port}/api/v1/pack`, + json: { + to, + names, + from: '/fixture', + } }; }