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

v1.18.x
psychobunny 11 years ago
parent 6dcd06b63c
commit 69e0aa338d

@ -27,8 +27,9 @@
async = require('async'),
semver = require('semver'),
winston = require('winston'),
pkg = require('./package.json'),
path = require('path'),
pkg = require('./package.json'),
utils = require('./public/src/utils.js'),
meta;
// Runtime environment
@ -108,15 +109,10 @@
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([
'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index',
'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);
utils.walk(path.join(__dirname, 'public/templates'), function (err, tplsToLoad) {
templates.init(tplsToLoad, customTemplates);
});
plugins.ready(function() {
templates.ready(webserver.init);

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

Loading…
Cancel
Save