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

closes #1497

Browse Source 
fixes user images in subfolder installs, if user image has https dont
append relative_path,
also removes relative_path in ajaxify.loadData so it doesnt call
/forum/api/forum/category etc.
This commit is contained in:
barisusakli
2014-05-30 15:22:52 -04:00
parent be19222817
commit e035d8f1de
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/src/ajaxify.js
View File

@@ -60,9 +60,8 @@ var ajaxify = ajaxify || {};
// Remove trailing slash
url = url.replace(/\/$/, "");
if (url.indexOf(RELATIVE_PATH.slice(1)) !== -1) {
url = url.slice(RELATIVE_PATH.length);
}
url = removeRelativePath(url);
var tpl_url = ajaxify.getTemplateMapping(url);
var hash = '';
@@ -124,6 +123,13 @@ var ajaxify = ajaxify || {};
return false;
};
function removeRelativePath(url) {
if (url.indexOf(RELATIVE_PATH.slice(1)) !== -1) {
url = url.slice(RELATIVE_PATH.length);
}
return url;
}
ajaxify.refresh = function() {
ajaxify.go(ajaxify.currentPage);
};
@@ -181,6 +187,8 @@ var ajaxify = ajaxify || {};
};
ajaxify.loadData = function(url, callback) {
url = removeRelativePath(url);
$(window).trigger('action:ajaxify.loadingData', {url: url});
if (ajaxify.preloader && ajaxify.preloader[url]) {
@@ -295,7 +303,7 @@ var ajaxify = ajaxify || {};
// Internal link
var url = this.href.replace(rootUrl + '/', ''),
currentTime = (new Date()).getTime();
if (!ajaxify.preloader[url] || currentTime - ajaxify.preloader[url].lastFetched > PRELOADER_RATE_LIMIT) {
ajaxify.preloader[url] = null;
ajaxify.loadData(url, function(err, data) {