Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 16:30:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6542

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-06-02 15:56:23 -04:00
parent d5e85c2eb3
commit d60d03d00f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/src/ajaxify.js
View File

@@ -108,11 +108,11 @@ $(document).ready(function () {
ajaxify.handleRedirects = function (url) {
url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, '')).toLowerCase();
var isClientToAdmin = url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0;
var isAdminToClient = !url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') === 0;
var isClientToAdmin = url.startsWith('admin') && window.location.pathname.indexOf(config.relative_path + '/admin') !== 0;
var isAdminToClient = !url.startsWith('admin') && window.location.pathname.indexOf(config.relative_path + '/admin') === 0;
if (isClientToAdmin || isAdminToClient) {
window.open(RELATIVE_PATH + '/' + url, '_top');
window.open(config.relative_path + '/' + url, '_top');
return true;
}
return false;
@@ -137,7 +137,7 @@ $(document).ready(function () {
if (window.history && window.history.pushState) {
window.history[!quiet ? 'pushState' : 'replaceState']({
url: url,
}, url, RELATIVE_PATH + '/' + url);
}, url, config.relative_path + '/' + url);
}
};
@@ -226,8 +226,8 @@ $(document).ready(function () {
};
ajaxify.removeRelativePath = function (url) {
if (url.startsWith(RELATIVE_PATH.slice(1))) {
url = url.slice(RELATIVE_PATH.length);
if (url.startsWith(config.relative_path.slice(1))) {
url = url.slice(config.relative_path.length);
}
return url;
};
@@ -289,7 +289,7 @@ $(document).ready(function () {
$(window).trigger('action:ajaxify.loadingData', { url: url });
apiXHR = $.ajax({
url: RELATIVE_PATH + '/api/' + url,
url: config.relative_path + '/api/' + url,
cache: false,
headers: {
'X-Return-To': app.previousUrl,
@@ -351,12 +351,12 @@ $(document).ready(function () {
return;
}
var internalLink = utils.isInternalURI(this, window.location, RELATIVE_PATH);
var internalLink = utils.isInternalURI(this, window.location, config.relative_path);
var process = function () {
if (!e.ctrlKey && !e.shiftKey && !e.metaKey && e.which === 1) {
if (internalLink) {
var pathname = this.href.replace(rootUrl + RELATIVE_PATH + '/', '');
var pathname = this.href.replace(rootUrl + config.relative_path + '/', '');
// Special handling for urls with hashes
if (window.location.pathname === this.pathname && this.hash.length) {
@@ -364,7 +364,7 @@ $(document).ready(function () {
} else if (ajaxify.go(pathname)) {
e.preventDefault();
}
} else if (window.location.pathname !== '/outgoing') {
} else if (window.location.pathname !== config.relative_path + '/outgoing') {
if (config.openOutgoingLinksInNewTab && $.contains(contentEl, this)) {
window.open(this.href, '_blank');
e.preventDefault();