From bdbdf510e05aa0865f00ba06ad04acfa6c860df3 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Apr 2018 14:24:01 -0400 Subject: [PATCH] closes #6462 --- public/src/ajaxify.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 39cbb48c48..8e1b85e407 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -109,9 +109,8 @@ $(document).ready(function () { 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 uploadsOrApi = url.startsWith('assets/') || url.startsWith('uploads') || url.startsWith('api'); - if (isClientToAdmin || isAdminToClient || uploadsOrApi) { + if (isClientToAdmin || isAdminToClient) { window.open(RELATIVE_PATH + '/' + url, '_top'); return true; } @@ -390,6 +389,13 @@ $(document).ready(function () { return; } + // Default behaviour for uploads and direct links to API urls + if (internalLink && ['/assets/uploads/', '/api/'].some(function (prefix) { + return String(_self.pathname).startsWith(config.relative_path + prefix); + })) { + return; + } + if (hrefEmpty(this.href) || this.protocol === 'javascript:' || $(this).attr('href') === '#') { return e.preventDefault(); }