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

actually fixed isPopState error

Browse Source
This commit is contained in:
Julian Lam
2015-02-23 11:50:41 -05:00
parent d8c9ec0d40
commit e6701c5a1f
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/src/ajaxify.js
View File

@@ -60,11 +60,8 @@ $(document).ready(function() {
app.enterRoom('');
// If the url is in the cache, load from cache instead
if (cache.get(url)) { return true; }
else {
cache.url = ajaxify.currentPage;
ajaxify.isPopState = false;
}
if (cache.get(url, callback)) { return true; }
else { cache.url = ajaxify.currentPage; }
$(window).off('scroll');

4
public/src/modules/ajaxifyCache.js
View File

@@ -12,7 +12,7 @@ define('ajaxifyCache', function() {
Cache.DOM = $('#content > *').detach();
};
Cache.get = function(url) {
Cache.get = function(url, callback) {
if (url === Cache.url && ajaxify.isPopState) {
// Swap DOM elements
// setTimeout(function() {
@@ -25,6 +25,8 @@ define('ajaxifyCache', function() {
Cache.url = ajaxify.currentPage;
ajaxify.currentPage = url;
if (typeof callback === 'function') { callback(); }
return true;
} else {
return false;