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

closes #3424

Browse Source
This commit is contained in:
barisusakli
2015-08-10 17:57:51 -04:00
parent 5a15ee7713
commit 9e1d5c8113
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public/src/ajaxify.js
View File

@@ -30,15 +30,15 @@ $(document).ready(function() {
ajaxify.currentPage = null; ajaxify.currentPage = null;
ajaxify.go = function (url, callback, quiet, search) { ajaxify.go = function (url, callback, quiet) {
if (!socket.connected) { if (!socket.connected) {
if (ajaxify.reconnectAction) { if (ajaxify.reconnectAction) {
$(window).off('action:reconnected', ajaxify.reconnectAction); $(window).off('action:reconnected', ajaxify.reconnectAction);
} }
ajaxify.reconnectAction = function(e) { ajaxify.reconnectAction = function(e) {
ajaxify.go(url, callback, quiet, search); ajaxify.go(url, callback, quiet);
$(window).off(e); $(window).off(e);
} };
$(window).on('action:reconnected', ajaxify.reconnectAction); $(window).on('action:reconnected', ajaxify.reconnectAction);
} }
@@ -54,7 +54,7 @@ $(document).ready(function() {
apiXHR.abort(); apiXHR.abort();
} }
url = ajaxify.start(url, quiet, search); url = ajaxify.start(url, quiet);
$('#footer, #content').removeClass('hide').addClass('ajaxifying'); $('#footer, #content').removeClass('hide').addClass('ajaxifying');
@@ -87,10 +87,8 @@ $(document).ready(function() {
}; };
ajaxify.start = function(url, quiet, search) { ajaxify.start = function(url, quiet) {
url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, '')); url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, ''));
var hash = window.location.hash;
search = search || '';
$(window).trigger('action:ajaxify.start', {url: url}); $(window).trigger('action:ajaxify.start', {url: url});
@@ -102,8 +100,8 @@ $(document).ready(function() {
if (window.history && window.history.pushState) { if (window.history && window.history.pushState) {
window.history[!quiet ? 'pushState' : 'replaceState']({ window.history[!quiet ? 'pushState' : 'replaceState']({
url: url + search + hash url: url
}, url, RELATIVE_PATH + '/' + url + search + hash); }, url, RELATIVE_PATH + '/' + url);
} }
return url; return url;
}; };
@@ -282,9 +280,6 @@ $(document).ready(function() {
if (window.location.pathname === this.pathname && this.hash.length) { if (window.location.pathname === this.pathname && this.hash.length) {
window.location.hash = this.hash; window.location.hash = this.hash;
} else { } else {
if (window.location.hash) {
window.location.hash = '';
}
if (ajaxify.go(pathname)) { if (ajaxify.go(pathname)) {
e.preventDefault(); e.preventDefault();
} }