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

closes #873, removed global translator, templates and server objects

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-25 16:39:27 -05:00
parent 393bb7245c
commit 2e786cc4d1
6 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@@ -106,11 +106,9 @@
upgrade.check(function(schema_ok) { upgrade.check(function(schema_ok) {
if (schema_ok || nconf.get('check-schema') === false) { if (schema_ok || nconf.get('check-schema') === false) {
sockets.init(); sockets.init(webserver.server);
plugins.init(); plugins.init();
global.templates = {};
global.translator = translator;
translator.loadServer(); translator.loadServer();

4
public/src/templates.js
View File

@@ -79,7 +79,7 @@
template.prototype.parse = parse; template.prototype.parse = parse;
template.prototype.html = String(html); template.prototype.html = String(html);
global.templates[file] = new template; templates[file] = new template;
loaded--; loaded--;
if (loaded === 0) { if (loaded === 0) {
@@ -396,7 +396,7 @@
namespace = ''; namespace = '';
} else { } else {
// clean up all undefined conditionals // clean up all undefined conditionals
template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, ''); template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, '');
} }
return template; return template;

14
src/emailer.js
View File

@@ -1,16 +1,18 @@
var User = require('./user'), var fs = require('fs'),
async = require('async'),
path = require('path'),
User = require('./user'),
Plugins = require('./plugins'), Plugins = require('./plugins'),
Meta = require('./meta'), Meta = require('./meta'),
Translator = require('../public/src/translator'), Translator = require('../public/src/translator'),
templates = require('../public/src/templates'),
fs = require('fs'),
async = require('async'),
path = require('path'),
Emailer = {}; Emailer = {};
var render = function(template, params, callback) { var render = function(template, params, callback) {
if (templates[template] !== null) {
if (templates[template]) {
Translator.translate(templates[template].parse(params), function(template) { Translator.translate(templates[template].parse(params), function(template) {
callback(null, template); callback(null, template);
}); });

5
src/routes/admin.js
View File

@@ -7,13 +7,14 @@ var nconf = require('nconf'),
user = require('./../user'), user = require('./../user'),
groups = require('../groups'), groups = require('../groups'),
topics = require('./../topics'), topics = require('./../topics'),
pkg = require('./../../package.json'), pkg = require('./../../package'),
categories = require('./../categories'), categories = require('./../categories'),
meta = require('../meta'), meta = require('../meta'),
plugins = require('../plugins'), plugins = require('../plugins'),
Languages = require('../languages'), Languages = require('../languages'),
events = require('./../events'), events = require('./../events'),
utils = require('./../../public/src/utils.js'); utils = require('./../../public/src/utils'),
templates = require('./../../public/src/templates');
(function (Admin) { (function (Admin) {
Admin.isAdmin = function (req, res, next) { Admin.isAdmin = function (req, res, next) {

4
src/socket.io/index.js
View File

@@ -30,9 +30,9 @@ Sockets.userSockets = {};
Sockets.rooms = {}; Sockets.rooms = {};
Sockets.init = function() { Sockets.init = function(server) {
io = socketioWildcard(SocketIO).listen(global.server, { io = socketioWildcard(SocketIO).listen(server, {
log: false, log: false,
transports: ['websocket', 'xhr-polling', 'jsonp-polling', 'flashsocket'], transports: ['websocket', 'xhr-polling', 'jsonp-polling', 'flashsocket'],
'browser client minification': true 'browser client minification': true

17
src/webserver.js
View File

@@ -28,7 +28,9 @@ var path = require('path'),
meta = require('./meta'), meta = require('./meta'),
feed = require('./feed'), feed = require('./feed'),
plugins = require('./plugins'), plugins = require('./plugins'),
logger = require('./logger'); logger = require('./logger'),
templates = require('./../public/src/templates'),
translator = require('./../public/src/translator');
if(nconf.get('ssl')) { if(nconf.get('ssl')) {
server = require('https').createServer({ server = require('https').createServer({
@@ -39,13 +41,12 @@ if(nconf.get('ssl')) {
server = require('http').createServer(WebServer); server = require('http').createServer(WebServer);
} }
module.exports.server = server;
(function (app) { (function (app) {
"use strict"; "use strict";
var templates = null, var clientScripts;
clientScripts;
plugins.ready(function() { plugins.ready(function() {
// Minify client-side libraries // Minify client-side libraries
@@ -60,9 +61,6 @@ if(nconf.get('ssl')) {
}); });
}); });
server.app = app;
/** /**
* `options` object requires: req, res * `options` object requires: req, res
* accepts: metaTags, linkTags * accepts: metaTags, linkTags
@@ -375,8 +373,6 @@ if(nconf.get('ssl')) {
}); });
module.exports.init = function () { module.exports.init = function () {
templates = global.templates;
// translate all static templates served by webserver here. ex. footer, logout // translate all static templates served by webserver here. ex. footer, logout
plugins.fireHook('filter:footer.build', '', function(err, appendHTML) { plugins.fireHook('filter:footer.build', '', function(err, appendHTML) {
var footer = templates.footer.parse({ var footer = templates.footer.parse({
@@ -931,6 +927,3 @@ if(nconf.get('ssl')) {
}); });
}(WebServer)); }(WebServer));
global.server = server;