diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index bba039ea66..e0c69687f6 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -31,6 +31,8 @@ var ajaxify = {};
var pagination, paginator_bar;
+ ajaxify.currentPage = null;
+
ajaxify.go = function (url, callback, template, quiet) {
// start: the following should be set like so: ajaxify.onchange(function(){}); where the code actually belongs
$(window).off('scroll');
@@ -69,6 +71,8 @@ var ajaxify = {};
}
if (templates.is_available(tpl_url) && !templates.force_refresh(tpl_url)) {
+ ajaxify.currentPage = tpl_url;
+
if (window.history && window.history.pushState) {
window.history[!quiet ? 'pushState' : 'replaceState']({
url: url
@@ -90,7 +94,7 @@ var ajaxify = {};
translator.load(tpl_url);
- jQuery('#footer, #content').addClass('ajaxifying');
+ jQuery('#footer, #content').removeClass('hide').addClass('ajaxifying');
templates.flush();
templates.load_template(function () {
@@ -129,6 +133,10 @@ var ajaxify = {};
return false;
};
+ ajaxify.refresh = function() {
+ ajaxify.go(ajaxify.currentPage);
+ };
+
$('document').ready(function () {
if (!window.history || !window.history.pushState) {
return; // no ajaxification for old browsers
@@ -154,7 +162,7 @@ var ajaxify = {};
return;
}
- if (!e.ctrlKey && e.which === 1) {
+ if ((!e.ctrlKey && !e.shiftKey) && e.which === 1) {
if (this.host === window.location.host) {
// Internal link
var url = this.href.replace(rootUrl + '/', '');
diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index 046a7e8186..cb2cff3e79 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -67,6 +67,7 @@
notifTrigger = notifContainer.querySelector('a'),
notifList = document.getElementById('notif-list'),
notifIcon = $('.notifications a');
+
notifTrigger.addEventListener('click', function(e) {
e.preventDefault();
if (notifContainer.className.indexOf('open') === -1) {
@@ -169,6 +170,10 @@
});
app.refreshTitle();
+ if (ajaxify.currentPage === 'notifications') {
+ ajaxify.refresh();
+ }
+
// Update the favicon + local storage
var savedCount = parseInt(localStorage.getItem('notifications:count'),10) || 0;
localStorage.setItem('notifications:count', savedCount+1);
diff --git a/public/src/forum/recent.js b/public/src/forum/recent.js
index 6b162db34f..c883c9c54b 100644
--- a/public/src/forum/recent.js
+++ b/public/src/forum/recent.js
@@ -81,18 +81,20 @@ define(function() {
}
Recent.onTopicsLoaded = function(topics) {
-
var html = templates.prepare(templates['recent'].blocks['topics']).parse({
topics: topics
- }),
- container = $('#topics-container');
+ });
+
+ translator.translate(html, function(translatedHTML) {
+ var container = $('#topics-container');
- $('#category-no-topics').remove();
+ $('#category-no-topics').remove();
- html = $(html);
- container.append(html);
- $('span.timeago').timeago();
- app.makeNumbersHumanReadable(html.find('.human-readable-number'));
+ html = $(html);
+ container.append(html);
+ $('span.timeago').timeago();
+ app.makeNumbersHumanReadable(html.find('.human-readable-number'));
+ });
}
Recent.loadMoreTopics = function() {
diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js
index 6debeeba84..e0dd1dd7d7 100644
--- a/public/src/forum/unread.js
+++ b/public/src/forum/unread.js
@@ -71,18 +71,20 @@ define(function() {
});
function onTopicsLoaded(topics) {
-
var html = templates.prepare(templates['unread'].blocks['topics']).parse({
topics: topics
- }),
- container = $('#topics-container');
+ });
- $('#category-no-topics').remove();
+ translator.translate(html, function(translatedHTML) {
+ var container = $('#topics-container');
- html = $(html);
- container.append(html);
- $('span.timeago').timeago();
- app.makeNumbersHumanReadable(html.find('.human-readable-number'));
+ $('#category-no-topics').remove();
+
+ html = $(translatedHTML);
+ container.append(html);
+ $('span.timeago').timeago();
+ app.makeNumbersHumanReadable(html.find('.human-readable-number'));
+ });
}
function loadMoreTopics() {
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index e9b970a1be..fa0e64d055 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -10,17 +10,17 @@
![]()
-
[[user: gravatar]]
+
[[user:gravatar]]
![]()
-
[[user: uploaded_picture]]
+
[[user:uploaded_picture]]
-
[[user: upload_new_picture]]
+
[[user:upload_new_picture]]