cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 10:58:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Address review

Browse Source
This commit is contained in:
Odd Stråbø 2020-11-24 20:44:14 +01:00
parent 27b113efba
commit 1d51b94d41
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scripts/clientUtils.js
View File

@ -29,10 +29,10 @@ export async function serverAddress() {
// if (current) return Promise.resolve(current);
const urls = [];
if (window.location.href.indexOf('/web/') !== -1) { // Do we polyfill String.prototype.includes?
if (window.location.href.indexOf('/web/') !== -1) {
const split = window.location.href.split('/web/');
for (let i = split.length - 1; i ; i--) {
for (let i = split.length - 1; i > 0; i--) {
urls.push(split.slice(0, i).join('/web/'));
}
}
@ -45,7 +45,7 @@ export async function serverAddress() {
urls.push(...await webSettings.getServers());
console.log('URL candidates:', urls);
console.debug('URL candidates:', urls);
const promises = urls.map(url => {
return fetch(`${url}/System/Info/Public`).then(resp => {
@ -67,8 +67,7 @@ export async function serverAddress() {
};
}));
}).then(configs => {
let selection = configs.find(obj => !obj.config.StartupWizardCompleted);
if (!selection) selection = configs[0];
let selection = configs.find(obj => !obj.config.StartupWizardCompleted) || configs[0];
return Promise.resolve(selection.url);
}).catch(error => {
console.log(error);