Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-26 21:56:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

ESlint comma-dangle

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-02-17 19:31:21 -07:00
parent aa64ec7db1
commit bc1d70c126
345 changed files with 1974 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/middleware/admin.js
View File

@@ -8,7 +8,7 @@ var plugins = require('../plugins');
var controllers = {
api: require('../controllers/api'),
helpers: require('../controllers/helpers')
helpers: require('../controllers/helpers'),
};
module.exports = function (middleware) {
@@ -45,7 +45,7 @@ module.exports = function (middleware) {
middleware.admin.renderHeader = function (req, res, data, next) {
var custom_header = {
'plugins': [],
'authentication': []
'authentication': [],
};
user.getUserFields(req.uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function (err, userData) {
@@ -78,7 +78,7 @@ module.exports = function (middleware) {
},
configs: function (next) {
meta.configs.list(next);
}
},
}, function (err, results) {
if (err) {
return next(err);
@@ -104,7 +104,7 @@ module.exports = function (middleware) {
'cache-buster': meta.config['cache-buster'] || '',
env: process.env.NODE_ENV ? true : false,
title: (acpPath || 'Dashboard') + ' | NodeBB Admin Control Panel',
bodyClass: data.bodyClass
bodyClass: data.bodyClass,
};
templateValues.template = {name: res.locals.template};

12
src/middleware/header.js
View File

@@ -11,7 +11,7 @@ var navigation = require('../navigation');
var controllers = {
api: require('../controllers/api'),
helpers: require('../controllers/helpers')
helpers: require('../controllers/helpers'),
};
module.exports = function (middleware) {
@@ -30,13 +30,13 @@ module.exports = function (middleware) {
},
plugins: function (next) {
plugins.fireHook('filter:middleware.buildHeader', {req: req, locals: res.locals}, next);
}
},
}, next);
},
function (results, next) {
res.locals.config = results.config;
next();
}
},
], next);
};
@@ -55,7 +55,7 @@ module.exports = function (middleware) {
searchEnabled: plugins.hasListeners('filter:search.query'),
config: res.locals.config,
relative_path: nconf.get('relative_path'),
bodyClass: data.bodyClass
bodyClass: data.bodyClass,
};
templateValues.configJSON = JSON.stringify(res.locals.config);
@@ -82,7 +82,7 @@ module.exports = function (middleware) {
picture: meta.config.defaultAvatar,
status: 'offline',
reputation: 0,
'email:confirmed': false
'email:confirmed': false,
};
if (req.uid) {
user.getUserFields(req.uid, Object.keys(userData), next);
@@ -99,7 +99,7 @@ module.exports = function (middleware) {
navigation: async.apply(navigation.get),
tags: async.apply(meta.tags.parse, res.locals.metaTags, res.locals.linkTags),
banned: async.apply(user.isBanned, req.uid),
banReason: async.apply(user.getBannedReason, req.uid)
banReason: async.apply(user.getBannedReason, req.uid),
}, function (err, results) {
if (err) {
return callback(err);

2
src/middleware/headers.js
View File

@@ -10,7 +10,7 @@ module.exports = function (middleware) {
'X-Frame-Options': meta.config['allow-from-uri'] ? 'ALLOW-FROM ' + encodeURI(meta.config['allow-from-uri']) : 'SAMEORIGIN',
'Access-Control-Allow-Origin': encodeURI(meta.config['access-control-allow-origin'] || 'null'),
'Access-Control-Allow-Methods': encodeURI(meta.config['access-control-allow-methods'] || ''),
'Access-Control-Allow-Headers': encodeURI(meta.config['access-control-allow-headers'] || '')
'Access-Control-Allow-Headers': encodeURI(meta.config['access-control-allow-headers'] || ''),
};
for (var key in headers) {

12
src/middleware/index.js
View File

@@ -19,7 +19,7 @@ var analytics = require('../analytics');
var controllers = {
api: require('./../controllers/api'),
helpers: require('../controllers/helpers')
helpers: require('../controllers/helpers'),
};
var middleware = {};
@@ -42,7 +42,7 @@ middleware.authenticate = function (req, res, next) {
return plugins.fireHook('action:middleware.authenticate', {
req: req,
res: res,
next: next
next: next,
});
}
@@ -77,7 +77,7 @@ middleware.pageView = function (req, res, next) {
analytics.pageView({
ip: req.ip,
path: req.path,
uid: req.uid
uid: req.uid,
});
plugins.fireHook('action:middleware.pageView', {req: req});
@@ -123,7 +123,7 @@ middleware.routeTouchIcon = function (req, res) {
return res.redirect(meta.config['brand:touchIcon']);
} else {
return res.sendFile(path.join(__dirname, '../../public', meta.config['brand:touchIcon'] || '/logo.png'), {
maxAge: req.app.enabled('cache') ? 5184000000 : 0
maxAge: req.app.enabled('cache') ? 5184000000 : 0,
});
}
};
@@ -196,11 +196,11 @@ middleware.processTimeagoLocales = function (req, res, next) {
if (exists) {
res.status(200).sendFile(localPath, {
maxAge: req.app.enabled('cache') ? 5184000000 : 0
maxAge: req.app.enabled('cache') ? 5184000000 : 0,
});
} else {
res.status(200).sendFile(path.join(__dirname, '../../public/vendor/jquery/timeago/locales', fallback), {
maxAge: req.app.enabled('cache') ? 5184000000 : 0
maxAge: req.app.enabled('cache') ? 5184000000 : 0,
});
}
};

2
src/middleware/maintenance.js
View File

@@ -24,7 +24,7 @@ module.exports = function (middleware) {
res.status(503);
var data = {
site_title: meta.config.title || 'NodeBB',
message: meta.config.maintenanceModeMessage
message: meta.config.maintenanceModeMessage,
};
if (res.locals.isAPI) {

4
src/middleware/render.js
View File

@@ -72,7 +72,7 @@ module.exports = function (middleware) {
},
footer: function (next) {
renderHeaderFooter('renderFooter', req, res, options, next);
}
},
}, next);
},
function (results, next) {
@@ -89,7 +89,7 @@ module.exports = function (middleware) {
return '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
});
next(null, translated);
}
},
], fn);
};

4
src/middleware/user.js
View File

@@ -8,7 +8,7 @@ var user = require('../user');
var privileges = require('../privileges');
var controllers = {
helpers: require('../controllers/helpers')
helpers: require('../controllers/helpers'),
};
module.exports = function (middleware) {
@@ -44,7 +44,7 @@ module.exports = function (middleware) {
} else {
next(null, false);
}
}
},
], function (err, allowed) {
if (err || allowed) {
return next(err);