Skip to content

Node.js based forum software built for the modern web

refactor: use one startsWith/indexOf

Barış Soner Uşaklı53afa24d64c8
diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 6023efc11a..afbe759cb6 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -160,11 +160,13 @@ ajaxify.widgets = { render: render };
ajaxify.handleRedirects = function (url) {
url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, '')).toLowerCase();
- const isClientToAdmin = url.startsWith('admin') && window.location.pathname.indexOf(config.relative_path + '/admin') !== 0;
- const isAdminToClient = !url.startsWith('admin') && window.location.pathname.indexOf(config.relative_path + '/admin') === 0;
+ const urlStartsWithAdmin = url.startsWith('admin');
+ const currentPathStartsWithAdmin = window.location.pathname.indexOf(`${config.relative_path}/admin`) === 0;
+ const isClientToAdmin = urlStartsWithAdmin && !currentPathStartsWithAdmin;
+ const isAdminToClient = !urlStartsWithAdmin && currentPathStartsWithAdmin;
if (isClientToAdmin || isAdminToClient) {
- window.open(config.relative_path + '/' + url, '_top');
+ window.open(`${config.relative_path}/${url}`, '_top');
return true;
}
return false;