mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

some bug fixes after master rebase

Browse source
This commit is contained in:
vitorsemeano 2020-10-18 18:58:09 +01:00
parent 3c84773792
commit a106e23ff8
9 changed files with 748 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/components/appRouter.js
View file

@ -310,17 +310,6 @@ class AppRouter {
url = route.contentPath || route.path;
}
if (url.includes('configurationpage')) {
url = ApiClient.getUrl('/web' + url);
} else if (url.indexOf('://') === -1) {
// Put a slash at the beginning but make sure to avoid a double slash
if (url.indexOf('/') !== 0) {
url = '/' + url;
}
url = this.baseUrl() + url;
}
if (ctx.querystring && route.enableContentQueryString) {
url += '?' + ctx.querystring;
}

8
src/components/layoutManager.js
View file

@ -1,7 +1,7 @@
import { appHost } from './apphost';
import browser from '../scripts/browser';
import { set, get } from '../scripts/settings/appSettings';
import appSettings from '../scripts/settings/appSettings';
import { Events } from 'jellyfin-apiclient';
function setLayout(instance, layout, selectedLayout) {
@ -20,7 +20,7 @@ class LayoutManager {
this.autoLayout();
if (save !== false) {
set('layout', '');
appSettings.set('layout', '');
}
} else {
setLayout(this, 'mobile', layout);
@ -28,7 +28,7 @@ class LayoutManager {
setLayout(this, 'desktop', layout);
if (save !== false) {
set('layout', layout);
appSettings.set('layout', layout);
}
}
@ -36,7 +36,7 @@ class LayoutManager {
}
getSavedLayout() {
return get('layout');
return appSettings.get('layout');
}
autoLayout() {