Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-05 16:07:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

reverting 754aef8a84

Browse Source
This commit is contained in:
psychobunny
2013-10-19 11:48:46 -04:00
parent 754aef8a84
commit 40319a66ff
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/src/ajaxify.js
View File

@@ -61,6 +61,14 @@ var ajaxify = {};
}
if (templates.is_available(tpl_url) && !templates.force_refresh(tpl_url)) {
if (quiet !== true) {
if (window.history && window.history.pushState) {
window.history.pushState({
"url": url
}, url, RELATIVE_PATH + "/" + url);
}
}
translator.load(tpl_url);
jQuery('#footer, #content').fadeOut(100);
@@ -76,24 +84,17 @@ var ajaxify = {};
callback();
}
utils.refreshTitle(url, function() {
jQuery('#content, #footer').stop(true, true).fadeIn(200, function () {
if (quiet !== true) {
if (window.history && window.history.pushState) {
window.history.pushState({
"url": url
}, url, RELATIVE_PATH + "/" + url);
}
}
jQuery('#content, #footer').stop(true, true).fadeIn(200, function () {
app.process_page();
if (window.location.hash)
hash = window.location.hash;
if (hash)
app.scrollToPost(hash.substr(1));
});
app.process_page();
if (window.location.hash)
hash = window.location.hash;
if (hash)
app.scrollToPost(hash.substr(1));
});
utils.refreshTitle(url);
}, url, template);
return true;

6
public/src/utils.js
View File

@@ -129,7 +129,7 @@
return tags;
},
refreshTitle: function(url, callback) {
refreshTitle: function(url) {
if (!url) {
var a = document.createElement('a');
a.href = document.location;
@@ -139,10 +139,6 @@
socket.emit('api:meta.buildTitle', url, function(title, numNotifications) {
document.title = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title;
if (callback) {
callback();
}
notificationIcon = notificationIcon || document.querySelector('.notifications a i');
if (numNotifications > 0 && notificationIcon) notificationIcon.className = 'icon-circle active';
});