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

resolved some todo that's been in there for many months

Browse Source
This commit is contained in:
psychobunny
2013-12-30 17:11:59 -05:00
parent 6dcd06b63c
commit 69e0aa338d
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app.js
View File

@@ -27,8 +27,9 @@
async = require('async'), async = require('async'),
semver = require('semver'), semver = require('semver'),
winston = require('winston'), winston = require('winston'),
pkg = require('./package.json'),
path = require('path'), path = require('path'),
pkg = require('./package.json'),
utils = require('./public/src/utils.js'),
meta; meta;
// Runtime environment // Runtime environment
@@ -108,16 +109,11 @@
var customTemplates = meta.config['theme:templates'] ? path.join(__dirname, 'node_modules', meta.config['theme:id'], meta.config['theme:templates']) : false; var customTemplates = meta.config['theme:templates'] ? path.join(__dirname, 'node_modules', meta.config['theme:id'], meta.config['theme:templates']) : false;
// todo: replace below with read directory code, derp.
templates.init([ utils.walk(path.join(__dirname, 'public/templates'), function (err, tplsToLoad) {
'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index', templates.init(tplsToLoad, customTemplates);
'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext', });
'emails/header', 'emails/footer',
'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic'
], customTemplates);
plugins.ready(function() { plugins.ready(function() {
templates.ready(webserver.init); templates.ready(webserver.init);
}); });

4
public/src/templates.js
View File

@@ -78,7 +78,9 @@
global.templates[file] = new template; global.templates[file] = new template;
loaded--; loaded--;
if (loaded == 0) templates.ready(); if (loaded === 0) {
templates.ready();
}
}); });
}(templatesToLoad[t])); }(templatesToLoad[t]));
} }