Improve Squire toolbar

Cleanup some JS code
This commit is contained in:
djmaze 2021-02-22 17:28:54 +01:00
parent e52b9abc61
commit 0158a5fe1e
9 changed files with 163 additions and 200 deletions

View file

@ -23,18 +23,13 @@ export function root(startupUrl = '') {
return HASH_PREFIX + pString(startupUrl);
}
/**
* @returns {string}
*/
export function rootAdmin() {
return Settings.app('adminHostUse') ? ROOT : SERVER_PREFIX + (Settings.app('adminPath') || 'admin');
}
/**
* @returns {string}
*/
export function logoutLink() {
return rl.adminArea() ? rootAdmin() : ROOT;
return (rl.adminArea() && !Settings.app('adminHostUse'))
? SERVER_PREFIX + (Settings.app('adminPath') || 'admin')
: ROOT;
}
/**