Merge branch 'adarqui'

v1.18.x
Julian Lam 12 years ago
commit f88f72abd2

@ -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>

@ -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;
} }
} }

@ -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')) {

Loading…
Cancel
Save