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

Merge remote-tracking branch 'upstream/master' into fix-another-usersettings

Browse source 
Conflicts:
	src/scripts/settings/userSettings.js
This commit is contained in:
Dmitry Lyzo 2020-05-28 20:08:37 +03:00
commit 15f0b12747
18 changed files with 321 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/scripts/settings/userSettings.js
View file

@ -149,7 +149,7 @@ export class UserSettings {
}
val = this.get('enableThemeSongs', false);
return val !== 'false';
return val === 'true';
}
/**
@ -163,7 +163,7 @@ export class UserSettings {
}
val = this.get('enableThemeVideos', false);
return val !== 'false';
return val === 'true';
}
/**
@ -194,6 +194,20 @@ export class UserSettings {
return val !== 'false';
}
/**
* Get or set 'Details Banner' state.
* @param {boolean|null} val - Flag to enable 'Details Banner' or undefined.
* @return {boolean} 'Details Banner' state.
*/
detailsBanner(val) {
if (val !== undefined) {
return this.set('detailsBanner', val.toString(), false);
}
val = this.get('detailsBanner', false);
return val !== 'false';
}
/**
* Get or set language.
* @param {string|null} val - Language.
@ -431,6 +445,7 @@ export const enableThemeSongs = currentSettings.enableThemeSongs.bind(currentSet
export const enableThemeVideos = currentSettings.enableThemeVideos.bind(currentSettings);
export const enableFastFadein = currentSettings.enableFastFadein.bind(currentSettings);
export const enableBackdrops = currentSettings.enableBackdrops.bind(currentSettings);
export const detailsBanner = currentSettings.detailsBanner.bind(currentSettings);
export const language = currentSettings.language.bind(currentSettings);
export const dateTimeLocale = currentSettings.dateTimeLocale.bind(currentSettings);
export const chromecastVersion = currentSettings.chromecastVersion.bind(currentSettings);