Use the ES6 linting rules from the website (#138)

This commit is contained in:
Rowan Manning
2016-07-22 14:34:10 +01:00
committed by GitHub
parent df8f5a7d07
commit e431fefbd8
33 changed files with 246 additions and 237 deletions

View File

@@ -15,14 +15,14 @@
'use strict';
var presentTask = require('../view/presenter/task');
const presentTask = require('../view/presenter/task');
module.exports = route;
// Route definition
function route(app) {
app.express.get('/', function(req, res, next) {
app.webservice.tasks.get({lastres: true}, function(err, tasks) {
app.express.get('/', (req, res, next) => {
app.webservice.tasks.get({lastres: true}, (err, tasks) => {
if (err) {
return next(err);
}

View File

@@ -15,15 +15,15 @@
'use strict';
var getStandards = require('../data/standards');
const getStandards = require('../data/standards');
module.exports = route;
// Route definition
function route(app) {
app.express.get('/new', function(req, res) {
var standards = getStandards().map(function(standard) {
app.express.get('/new', (req, res) => {
const standards = getStandards().map(standard => {
if (standard.title === 'WCAG2AA') {
standard.selected = true;
}
@@ -35,8 +35,8 @@ function route(app) {
});
});
app.express.post('/new', function(req, res) {
var newTask = {
app.express.post('/new', (req, res) => {
const newTask = {
name: req.body.name,
url: req.body.url,
standard: req.body.standard,
@@ -46,13 +46,13 @@ function route(app) {
username: req.body.username,
password: req.body.password
};
app.webservice.tasks.create(newTask, function(err, task) {
app.webservice.tasks.create(newTask, (err, task) => {
if (err) {
var standards = getStandards().map(function(standard) {
const standards = getStandards().map(standard => {
if (standard.title === newTask.standard) {
standard.selected = true;
}
standard.rules = standard.rules.map(function(rule) {
standard.rules = standard.rules.map(rule => {
if (newTask.ignore.indexOf(rule.name) !== -1) {
rule.ignored = true;
}
@@ -66,7 +66,7 @@ function route(app) {
task: newTask
});
}
res.redirect('/' + task.id + '?added');
res.redirect(`/${task.id}?added`);
});
});

View File

@@ -15,7 +15,7 @@
'use strict';
var moment = require('moment');
const moment = require('moment');
module.exports = route;
@@ -23,14 +23,14 @@ module.exports = route;
function route(app) {
function getTaskAndResult(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
app.webservice.task(req.params.id).get({}, (err, task) => {
if (err) {
return next('route');
}
app.webservice
.task(req.params.id)
.result(req.params.rid)
.get({full: true}, function(err, result) {
.get({full: true}, (err, result) => {
if (err) {
return next('route');
}
@@ -58,11 +58,11 @@ function route(app) {
].join('');
}
app.express.get('/:id/:rid.csv', getTaskAndResult, function(req, res) {
var task = res.locals.task;
var result = res.locals.result;
var rows = ['"code","message","type","context","selector"'];
result.results.forEach(function(msg) {
app.express.get('/:id/:rid.csv', getTaskAndResult, (req, res) => {
const task = res.locals.task;
const result = res.locals.result;
const rows = ['"code","message","type","context","selector"'];
result.results.forEach(msg => {
rows.push([
JSON.stringify(msg.code),
JSON.stringify(msg.message),
@@ -75,9 +75,9 @@ function route(app) {
res.send(rows.join('\n'));
});
app.express.get('/:id/:rid.json', getTaskAndResult, function(req, res) {
var task = res.locals.task;
var result = res.locals.result;
app.express.get('/:id/:rid.json', getTaskAndResult, (req, res) => {
const task = res.locals.task;
const result = res.locals.result;
res.attachment(getDownloadFileName(task, result, 'json'));
delete task.id;
delete result.id;

View File

@@ -15,23 +15,23 @@
'use strict';
var presentTask = require('../../view/presenter/task');
var presentResult = require('../../view/presenter/result');
const presentTask = require('../../view/presenter/task');
const presentResult = require('../../view/presenter/result');
module.exports = route;
// Route definition
function route(app) {
app.express.get('/:id/:rid', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
app.express.get('/:id/:rid', (req, res, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => {
if (err) {
return next();
}
app.webservice
.task(req.params.id)
.result(req.params.rid)
.get({full: true}, function(err, result) {
.get({full: true}, (err, result) => {
if (err) {
return next();
}

View File

@@ -15,15 +15,15 @@
'use strict';
var presentTask = require('../../view/presenter/task');
const presentTask = require('../../view/presenter/task');
module.exports = route;
// Route definition
function route(app) {
app.express.get('/:id/delete', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
app.express.get('/:id/delete', (req, res, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => {
if (err) {
return next();
}
@@ -34,8 +34,8 @@ function route(app) {
});
});
app.express.post('/:id/delete', function(req, res, next) {
app.webservice.task(req.params.id).remove(function(err) {
app.express.post('/:id/delete', (req, res, next) => {
app.webservice.task(req.params.id).remove(err => {
if (err) {
return next();
}

View File

@@ -15,24 +15,24 @@
'use strict';
var presentTask = require('../../view/presenter/task');
var getStandards = require('../../data/standards');
const presentTask = require('../../view/presenter/task');
const getStandards = require('../../data/standards');
module.exports = route;
// Route definition
function route(app) {
app.express.get('/:id/edit', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
app.express.get('/:id/edit', (req, res, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => {
if (err) {
return next();
}
var standards = getStandards().map(function(standard) {
const standards = getStandards().map(standard => {
if (standard.title === task.standard) {
standard.selected = true;
}
standard.rules = standard.rules.map(function(rule) {
standard.rules = standard.rules.map(rule => {
if (task.ignore.indexOf(rule.name) !== -1) {
rule.ignored = true;
}
@@ -49,13 +49,13 @@ function route(app) {
});
});
app.express.post('/:id/edit', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
app.express.post('/:id/edit', (req, res, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => {
if (err) {
return next();
}
req.body.ignore = req.body.ignore || [];
app.webservice.task(req.params.id).edit(req.body, function(err) {
app.webservice.task(req.params.id).edit(req.body, err => {
if (err) {
task.name = req.body.name;
task.ignore = req.body.ignore;
@@ -63,11 +63,11 @@ function route(app) {
task.wait = req.body.wait;
task.username = req.body.username;
task.password = req.body.password;
var standards = getStandards().map(function(standard) {
const standards = getStandards().map(standard => {
if (standard.title === task.standard) {
standard.selected = true;
}
standard.rules = standard.rules.map(function(rule) {
standard.rules = standard.rules.map(rule => {
if (task.ignore.indexOf(rule.name) !== -1) {
rule.ignored = true;
}
@@ -82,7 +82,7 @@ function route(app) {
isTaskSubPage: true
});
}
res.redirect('/' + req.params.id + '/edit?edited');
res.redirect(`/${req.params.id}/edit?edited`);
});
});
});

View File

@@ -5,20 +5,20 @@ module.exports = route;
// Route definition
function route(app) {
app.express.post('/:id/ignore', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
app.express.post('/:id/ignore', (req, res, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => {
if (err) {
return next();
}
var edit = {
const edit = {
name: task.name,
ignore: task.ignore
};
if (typeof req.body.rule === 'string') {
edit.ignore.push(req.body.rule);
}
app.webservice.task(req.params.id).edit(edit, function() {
res.redirect('/' + req.params.id + '?rule-ignored');
app.webservice.task(req.params.id).edit(edit, () => {
res.redirect(`/${req.params.id}?rule-ignored`);
});
});
});

View File

@@ -15,25 +15,25 @@
'use strict';
var presentTask = require('../../view/presenter/task');
var presentResult = require('../../view/presenter/result');
var presentResultList = require('../../view/presenter/result-list');
const presentTask = require('../../view/presenter/task');
const presentResult = require('../../view/presenter/result');
const presentResultList = require('../../view/presenter/result-list');
module.exports = route;
// Route definition
function route(app) {
app.express.get('/:id', function(req, res, next) {
app.webservice.task(req.params.id).get({lastres: true}, function(err, task) {
app.express.get('/:id', (req, res, next) => {
app.webservice.task(req.params.id).get({lastres: true}, (err, task) => {
if (err) {
return next();
}
app.webservice.task(req.params.id).results({}, function(err, results) {
app.webservice.task(req.params.id).results({}, (err, results) => {
if (err) {
return next(err);
}
var presentedResults = presentResultList(results.map(presentResult));
const presentedResults = presentResultList(results.map(presentResult));
res.render('task', {
task: presentTask(task),
results: presentedResults,

View File

@@ -20,12 +20,12 @@ module.exports = route;
// Route definition
function route(app) {
app.express.get('/:id/run', function(req, res, next) {
app.webservice.task(req.params.id).run(function(err) {
app.express.get('/:id/run', (req, res, next) => {
app.webservice.task(req.params.id).run(err => {
if (err) {
return next();
}
res.redirect('/' + req.params.id + '?running');
res.redirect(`/${req.params.id}?running`);
});
});

View File

@@ -5,21 +5,21 @@ module.exports = route;
// Route definition
function route(app) {
app.express.post('/:id/unignore', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
app.express.post('/:id/unignore', (req, res, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => {
if (err) {
return next();
}
var edit = {
const edit = {
name: task.name,
ignore: task.ignore
};
var indexOfRule = edit.ignore.indexOf(req.body.rule);
const indexOfRule = edit.ignore.indexOf(req.body.rule);
if (typeof req.body.rule === 'string' && indexOfRule !== -1) {
edit.ignore.splice(indexOfRule, 1);
}
app.webservice.task(req.params.id).edit(edit, function() {
res.redirect('/' + req.params.id + '?rule-unignored');
app.webservice.task(req.params.id).edit(edit, () => {
res.redirect(`/${req.params.id}?rule-unignored`);
});
});
});