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

moving pluginRoutes to top of route stack (like others), put app.load hook behind plugins' ready callback

Browse Source
This commit is contained in:
Julian Lam
2014-03-10 21:54:30 -04:00
parent 661dff2f9b
commit ffa42ffea3
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/middleware/index.js
View File

@@ -80,7 +80,7 @@ function compileTemplates(pluginTemplates) {
winston.info('[themes] Compiling templates'); winston.info('[themes] Compiling templates');
rimraf.sync(nconf.get('views_dir')); rimraf.sync(nconf.get('views_dir'));
mkdirp.sync(nconf.get('views_dir')); mkdirp.sync(nconf.get('views_dir'));
utils.walk(nconf.get('base_templates_path'), function(err, baseTpls) { utils.walk(nconf.get('base_templates_path'), function(err, baseTpls) {
utils.walk(nconf.get('theme_templates_path'), function (err, themeTpls) { utils.walk(nconf.get('theme_templates_path'), function (err, themeTpls) {
var paths = pluginTemplates; var paths = pluginTemplates;
@@ -123,7 +123,7 @@ function compileTemplates(pluginTemplates) {
} }
}); });
}); });
}); });
} }
function handleErrors(err, req, res, next) { function handleErrors(err, req, res, next) {

4
src/plugins.js
View File

@@ -305,11 +305,11 @@ var fs = require('fs'),
if (callback) { if (callback) {
args.pop(); args.pop();
} }
hookList = Plugins.loadedHooks[hook]; hookList = Plugins.loadedHooks[hook];
if (hookList && Array.isArray(hookList)) { if (hookList && Array.isArray(hookList)) {
//if (global.env === 'development') winston.info('[plugins] Firing hook: \'' + hook + '\''); // if (global.env === 'development') winston.info('[plugins] Firing hook: \'' + hook + '\'');
var hookType = hook.split(':')[0]; var hookType = hook.split(':')[0];
switch (hookType) { switch (hookType) {
case 'filter': case 'filter':

10
src/routes/index.js
View File

@@ -18,7 +18,8 @@ module.exports = function(app, middleware) {
metaRoutes(app, middleware, controllers); metaRoutes(app, middleware, controllers);
apiRoutes(app, middleware, controllers); apiRoutes(app, middleware, controllers);
feedRoutes(app, middleware, controllers); feedRoutes(app, middleware, controllers);
pluginRoutes(app, middleware, controllers);
/** /**
* Every view has an associated API route. * Every view has an associated API route.
* *
@@ -119,10 +120,11 @@ module.exports = function(app, middleware) {
app.get('/api/users/latest', middleware.checkGlobalPrivacySettings, controllers.users.getUsersSortedByJoinDate); app.get('/api/users/latest', middleware.checkGlobalPrivacySettings, controllers.users.getUsersSortedByJoinDate);
app.get('/users/search', middleware.buildHeader, middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch); app.get('/users/search', middleware.buildHeader, middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch);
app.get('/api/users/search', middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch); app.get('/api/users/search', middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch);
pluginRoutes(app, middleware, controllers); plugins.ready(function() {
plugins.fireHook('action:app.load', app, middleware, controllers); plugins.fireHook('action:app.load', app, middleware, controllers);
});
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
require('./debug')(app, middleware, controllers); require('./debug')(app, middleware, controllers);