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

Merge branch 'adarqui'

Browse Source
This commit is contained in:
Julian Lam
2013-10-05 22:47:59 -04:00
parent 63ff572076 715c14b78d
commit f88f72abd2
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/templates/admin/logger.tpl
View File

@@ -40,10 +40,7 @@
<button class="btn btn-lg btn-primary" id="save">Save</button> <button class="btn btn-lg btn-primary" id="save">Save</button>
<script> <script>
var loadDelay = setInterval(function() { require(['forum/admin/settings'], function(Settings) {
if (nodebb_admin) { Settings.prepare();
nodebb_admin.prepare(); });
clearInterval(loadDelay);
}
}, 500);
</script> </script>

4
src/logger.js
View File

@@ -139,10 +139,10 @@ var opts = {
for(var v in clients) { for(var v in clients) {
var client = clients[v]; var client = clients[v];
if(client.oEmit != client.emit) if(client.oEmit != undefined && client.oEmit != client.emit)
client.emit = client.oEmit; client.emit = client.oEmit;
if(client.$oEmit != client.$emit) if(client.$oEmit != undefined && client.$oEmit != client.$emit)
client.$emit = client.$oEmit; client.$emit = client.$oEmit;
} }
} }

2
src/webserver.js
View File

@@ -156,7 +156,7 @@ var express = require('express'),
app.use(function (req, res, next) { app.use(function (req, res, next) {
res.status(404); res.status(404);
if (path.dirname(req.url) === '/src/forum') { if (path.dirname(req.url).slice(0, 10) === '/src/forum') {
// Handle missing client-side scripts // Handle missing client-side scripts
res.type('text/javascript').send(200, ''); res.type('text/javascript').send(200, '');
} else if (req.accepts('html')) { } else if (req.accepts('html')) {