Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-24 01:10:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup webserver.js requires

Browse Source 
the .js in a require is implicit and unnecessary;
sorted the requires out so that builtins are first, then npm deps, then locally provided libs.
minor changes to some strings, just using single-quotes to match the style through the rest of the file.
This commit is contained in:
Damian Bushong
2013-11-18 02:39:08 -06:00
parent a827888ee3
commit 51355a53d9
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/webserver.js
View File

@@ -1,31 +1,33 @@
var express = require('express'), var path = require('path'),
fs = require('fs'),
express = require('express'),
express_namespace = require('express-namespace'), express_namespace = require('express-namespace'),
WebServer = express(), WebServer = express(),
server = require('http').createServer(WebServer), server = require('http').createServer(WebServer),
RedisStore = require('connect-redis')(express), RedisStore = require('connect-redis')(express),
path = require('path'),
RDB = require('./redis'),
utils = require('../public/src/utils.js'),
pkg = require('../package.json'),
fs = require('fs'),
user = require('./user.js'),
categories = require('./categories.js'),
posts = require('./posts.js'),
topics = require('./topics.js'),
notifications = require('./notifications.js'),
admin = require('./routes/admin.js'),
userRoute = require('./routes/user.js'),
apiRoute = require('./routes/api.js'),
auth = require('./routes/authentication.js'),
meta = require('./meta.js'),
feed = require('./feed'),
plugins = require('./plugins'),
nconf = require('nconf'), nconf = require('nconf'),
winston = require('winston'), winston = require('winston'),
validator = require('validator'), validator = require('validator'),
async = require('async'), async = require('async'),
logger = require('./logger.js');
pkg = require('../package.json'),
utils = require('../public/src/utils'),
RDB = require('./redis'),
user = require('./user'),
categories = require('./categories'),
posts = require('./posts'),
topics = require('./topics'),
notifications = require('./notifications'),
admin = require('./routes/admin'),
userRoute = require('./routes/user'),
apiRoute = require('./routes/api'),
auth = require('./routes/authentication'),
meta = require('./meta'),
feed = require('./feed'),
plugins = require('./plugins'),
logger = require('./logger');
(function (app) { (function (app) {
"use strict"; "use strict";
@@ -144,7 +146,7 @@ var express = require('express'),
res.locals.csrf_token = req.session._csrf; res.locals.csrf_token = req.session._csrf;
// Disable framing // Disable framing
res.setHeader("X-Frame-Options", "DENY"); res.setHeader('X-Frame-Options', 'DENY');
next(); next();
}); });
@@ -645,7 +647,7 @@ var express = require('express'),
req: req, req: req,
res: res res: res
}, function (err, header) { }, function (err, header) {
res.send(header + app.create_route("recent/" + req.params.term, null, "recent") + templates.footer); res.send(header + app.create_route('recent/' + req.params.term, null, 'recent') + templates.footer);
}); });
}); });
@@ -676,7 +678,7 @@ var express = require('express'),
req: req, req: req,
res: res res: res
}, function (err, header) { }, function (err, header) {
res.send(header + app.create_route("search/" + req.params.term, null, "search") + templates.footer); res.send(header + app.create_route('search/' + req.params.term, null, 'search') + templates.footer);
}); });
}); });
@@ -736,4 +738,4 @@ var express = require('express'),
}(WebServer)); }(WebServer));
global.server = server; global.server = server;