Fix JSCS errors

This commit is contained in:
Rowan Manning
2016-04-25 21:26:59 +01:00
parent 90328cfa39
commit ea48d6a6fd
31 changed files with 366 additions and 364 deletions

View File

@@ -1,15 +1,15 @@
// This file is part of pa11y-dashboard.
//
//
// pa11y-dashboard is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// pa11y-dashboard is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
@@ -20,9 +20,9 @@ var 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) {
function route(app) {
app.express.get('/', function(req, res, next) {
app.webservice.tasks.get({lastres: true}, function(err, tasks) {
if (err) {
return next(err);
}

View File

@@ -20,10 +20,10 @@ var getStandards = require('../data/standards');
module.exports = route;
// Route definition
function route (app) {
function route(app) {
app.express.get('/new', function (req, res) {
var standards = getStandards().map(function (standard) {
app.express.get('/new', function(req, res) {
var standards = getStandards().map(function(standard) {
if (standard.title === 'WCAG2AA') {
standard.selected = true;
}
@@ -35,7 +35,7 @@ function route (app) {
});
});
app.express.post('/new', function (req, res) {
app.express.post('/new', function(req, res) {
var newTask = {
name: req.body.name,
url: req.body.url,
@@ -45,13 +45,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, function(err, task) {
if (err) {
var standards = getStandards().map(function (standard) {
var standards = getStandards().map(function(standard) {
if (standard.title === newTask.standard) {
standard.selected = true;
}
standard.rules = standard.rules.map(function (rule) {
standard.rules = standard.rules.map(function(rule) {
if (newTask.ignore.indexOf(rule.name) !== -1) {
rule.ignored = true;
}

View File

@@ -1,15 +1,15 @@
// This file is part of pa11y-dashboard.
//
//
// pa11y-dashboard is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// pa11y-dashboard is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
@@ -20,67 +20,67 @@ var moment = require('moment');
module.exports = route;
// Route definition
function route (app) {
function route(app) {
function getTaskAndResult (req, res, next) {
app.webservice.task(req.params.id).get({}, function (err, task) {
if (err) {
return next('route');
}
app.webservice
.task(req.params.id)
.result(req.params.rid)
.get({full: true}, function (err, result) {
if (err) {
return next('route');
}
res.locals.task = task;
res.locals.result = result;
next();
});
});
}
function getTaskAndResult(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
if (err) {
return next('route');
}
app.webservice
.task(req.params.id)
.result(req.params.rid)
.get({full: true}, function(err, result) {
if (err) {
return next('route');
}
res.locals.task = task;
res.locals.result = result;
next();
});
});
}
function getDownloadFileName (task, result, extension) {
return [
'pa11y',
'--',
task.url
.replace(/^https?:\/\//i, '')
.replace(/\/$/, '')
.replace(/[^a-z0-9\.\-\_]+/gi, '-'),
'--',
task.standard.toLowerCase(),
'--',
moment(result.date).format('YYYY-MM-DD'),
'.',
extension
].join('');
}
function getDownloadFileName(task, result, extension) {
return [
'pa11y',
'--',
task.url
.replace(/^https?:\/\//i, '')
.replace(/\/$/, '')
.replace(/[^a-z0-9\.\-\_]+/gi, '-'),
'--',
task.standard.toLowerCase(),
'--',
moment(result.date).format('YYYY-MM-DD'),
'.',
extension
].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"'];
result.results.forEach(function (msg) {
rows.push([
JSON.stringify(msg.code),
JSON.stringify(msg.message),
JSON.stringify(msg.type)
].join(','));
});
res.attachment(getDownloadFileName(task, result, 'csv'));
res.send(rows.join('\n'));
});
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"'];
result.results.forEach(function(msg) {
rows.push([
JSON.stringify(msg.code),
JSON.stringify(msg.message),
JSON.stringify(msg.type)
].join(','));
});
res.attachment(getDownloadFileName(task, result, 'csv'));
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;
res.attachment(getDownloadFileName(task, result, 'json'));
delete task.id;
delete result.id;
result.task = task;
res.send(result);
});
app.express.get('/:id/:rid.json', getTaskAndResult, function(req, res) {
var task = res.locals.task;
var result = res.locals.result;
res.attachment(getDownloadFileName(task, result, 'json'));
delete task.id;
delete result.id;
result.task = task;
res.send(result);
});
}

View File

@@ -1,15 +1,15 @@
// This file is part of pa11y-dashboard.
//
//
// pa11y-dashboard is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// pa11y-dashboard is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
@@ -21,27 +21,27 @@ var presentResult = require('../../view/presenter/result');
module.exports = route;
// Route definition
function route (app) {
function route(app) {
app.express.get('/:id/:rid', function (req, res, next) {
app.webservice.task(req.params.id).get({}, function (err, task) {
if (err) {
return next();
}
app.webservice
.task(req.params.id)
.result(req.params.rid)
.get({full: true}, function (err, result) {
if (err) {
return next();
}
res.render('result', {
task: presentTask(task),
mainResult: presentResult(result),
isResultPage: true
});
});
});
});
app.express.get('/:id/:rid', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
if (err) {
return next();
}
app.webservice
.task(req.params.id)
.result(req.params.rid)
.get({full: true}, function(err, result) {
if (err) {
return next();
}
res.render('result', {
task: presentTask(task),
mainResult: presentResult(result),
isResultPage: true
});
});
});
});
}

View File

@@ -20,10 +20,10 @@ var presentTask = require('../../view/presenter/task');
module.exports = route;
// Route definition
function route (app) {
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', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(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', function(req, res, next) {
app.webservice.task(req.params.id).remove(function(err) {
if (err) {
return next();
}

View File

@@ -21,18 +21,18 @@ var getStandards = require('../../data/standards');
module.exports = route;
// Route definition
function route (app) {
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', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
if (err) {
return next();
}
var standards = getStandards().map(function (standard) {
var standards = getStandards().map(function(standard) {
if (standard.title === task.standard) {
standard.selected = true;
}
standard.rules = standard.rules.map(function (rule) {
standard.rules = standard.rules.map(function(rule) {
if (task.ignore.indexOf(rule.name) !== -1) {
rule.ignored = true;
}
@@ -49,24 +49,24 @@ 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', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(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, function(err) {
if (err) {
task.name = req.body.name;
task.ignore = req.body.ignore;
task.timeout = req.body.timeout;
task.username = req.body.username;
task.password = req.body.password;
var standards = getStandards().map(function (standard) {
var standards = getStandards().map(function(standard) {
if (standard.title === task.standard) {
standard.selected = true;
}
standard.rules = standard.rules.map(function (rule) {
standard.rules = standard.rules.map(function(rule) {
if (task.ignore.indexOf(rule.name) !== -1) {
rule.ignored = true;
}

View File

@@ -3,10 +3,10 @@
module.exports = route;
// Route definition
function route (app) {
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', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
if (err) {
return next();
}
@@ -17,7 +17,7 @@ function route (app) {
if (typeof req.body.rule === 'string') {
edit.ignore.push(req.body.rule);
}
app.webservice.task(req.params.id).edit(edit, function () {
app.webservice.task(req.params.id).edit(edit, function() {
res.redirect('/' + req.params.id + '?rule-ignored');
});
});

View File

@@ -1,15 +1,15 @@
// This file is part of pa11y-dashboard.
//
//
// pa11y-dashboard is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// pa11y-dashboard is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
@@ -22,14 +22,14 @@ var presentResultList = require('../../view/presenter/result-list');
module.exports = route;
// Route definition
function route (app) {
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', function(req, res, next) {
app.webservice.task(req.params.id).get({lastres: true}, function(err, task) {
if (err) {
return next();
}
app.webservice.task(req.params.id).results({}, function (err, results) {
app.webservice.task(req.params.id).results({}, function(err, results) {
if (err) {
return next(err);
}

View File

@@ -18,10 +18,10 @@
module.exports = route;
// Route definition
function route (app) {
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', function(req, res, next) {
app.webservice.task(req.params.id).run(function(err) {
if (err) {
return next();
}

View File

@@ -3,10 +3,10 @@
module.exports = route;
// Route definition
function route (app) {
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', function(req, res, next) {
app.webservice.task(req.params.id).get({}, function(err, task) {
if (err) {
return next();
}
@@ -18,7 +18,7 @@ function route (app) {
if (typeof req.body.rule === 'string' && indexOfRule !== -1) {
edit.ignore.splice(indexOfRule, 1);
}
app.webservice.task(req.params.id).edit(edit, function () {
app.webservice.task(req.params.id).edit(edit, function() {
res.redirect('/' + req.params.id + '?rule-unignored');
});
});