From f68b692ce4a9ae4fddbfd8cc599d26cf5ed850df Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Mon, 27 Jan 2014 17:15:17 -0500 Subject: [PATCH] closes #863 --- public/src/modules/notifications.js | 2 ++ public/templates/admin/settings.tpl | 2 ++ src/meta.js | 4 ++-- src/webserver.js | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index 9eb48b8449..43b614d339 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -12,11 +12,13 @@ define(function() { e.preventDefault(); if (notifContainer.className.indexOf('open') === -1) { socket.emit('notifications.get', null, function(err, data) { + var notifFrag = document.createDocumentFragment(), notifEl = document.createElement('li'), numRead = data.read.length, numUnread = data.unread.length, x; + notifList.innerHTML = ''; if (!err && (data.read.length + data.unread.length) > 0) { for (x = 0; x < numUnread; x++) { diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl index 3601f7c2ca..6da4d3594a 100644 --- a/public/templates/admin/settings.tpl +++ b/public/templates/admin/settings.tpl @@ -17,6 +17,8 @@

+ +

diff --git a/src/meta.js b/src/meta.js index c130f1f974..1edd2dc8ab 100644 --- a/src/meta.js +++ b/src/meta.js @@ -174,9 +174,9 @@ var fs = require('fs'), var title; if (err) { - title = Meta.config.title || 'NodeBB'; + title = Meta.config.browserTitle || 'NodeBB'; } else { - title = (title ? title + ' | ' : '') + (Meta.config.title || 'NodeBB'); + title = (title ? title + ' | ' : '') + (Meta.config.browserTitle || 'NodeBB'); } callback(null, title); diff --git a/src/webserver.js b/src/webserver.js index 01ba2ac5c0..efd0c4f7bb 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -100,7 +100,7 @@ module.exports.server = server; 'brand:logo': meta.config['brand:logo'] || '', 'brand:logo:display': meta.config['brand:logo']?'':'hide', 'brand:favicon': meta.config['brand:favicon'] || nconf.get('relative_path') + '/favicon.ico', - browserTitle: meta.config.title || 'NodeBB', + browserTitle: meta.config.browserTitle || 'NodeBB', csrf: options.res.locals.csrf_token, relative_path: nconf.get('relative_path'), clientScripts: clientScripts,