mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-16 10:46:14 +01:00
closes #2946
This commit is contained in:
@@ -31,7 +31,7 @@ $(document).ready(function() {
|
||||
ajaxify.currentPage = null;
|
||||
|
||||
ajaxify.go = function (url, callback, quiet) {
|
||||
if (ajaxify.handleACPRedirect(url) || ajaxify.handleNonAPIRoutes(url)) {
|
||||
if (ajaxify.handleRedirects(url)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -65,24 +65,17 @@ $(document).ready(function() {
|
||||
return true;
|
||||
};
|
||||
|
||||
ajaxify.handleACPRedirect = function(url) {
|
||||
// If ajaxifying into an admin route from regular site, do a cold load.
|
||||
url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));
|
||||
if (url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0) {
|
||||
ajaxify.handleRedirects = function(url) {
|
||||
url = ajaxify.removeRelativePath(url.replace(/\/$/, '')).toLowerCase();
|
||||
var isAdminRoute = url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0;
|
||||
var uploadsOrApi = url.startsWith('uploads') || url.startsWith('api');
|
||||
if (isAdminRoute || uploadsOrApi) {
|
||||
window.open(RELATIVE_PATH + '/' + url, '_blank');
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
ajaxify.handleNonAPIRoutes = function(url) {
|
||||
url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));
|
||||
if (url.startsWith('uploads')) {
|
||||
window.open(RELATIVE_PATH + '/' + url, '_blank');
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
ajaxify.start = function(url, quiet, search) {
|
||||
url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));
|
||||
|
||||
Reference in New Issue
Block a user