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

update theme song settings

This commit is contained in:
Luke Pulverenti 2016-09-09 15:03:03 -04:00
parent 4c7061b489
commit 8b6669e8cb
4 changed files with 43 additions and 18 deletions

View file

@ -1,4 +1,4 @@
define(['playbackManager', 'browser'], function (playbackManager, browser) { define(['playbackManager', 'userSettings'], function (playbackManager, userSettings) {
var currentOwnerId; var currentOwnerId;
var currentThemeIds = []; var currentThemeIds = [];
@ -40,13 +40,10 @@ define(['playbackManager', 'browser'], function (playbackManager, browser) {
function enabled(mediaType) { function enabled(mediaType) {
if (mediaType == 'Video') { if (mediaType == 'Video') {
// too slow return userSettings.enableThemeVideos();
if (browser.slow) {
return false;
}
} }
return true; return userSettings.enableThemeSongs();
} }
function loadThemeMedia(item) { function loadThemeMedia(item) {

View file

@ -1,4 +1,4 @@
define(['appSettings', 'events'], function (appsettings, events) { define(['appSettings', 'events', 'browser'], function (appsettings, events, browser) {
return function () { return function () {
@ -85,6 +85,36 @@ define(['appSettings', 'events'], function (appsettings, events) {
return true; return true;
}; };
self.enableThemeSongs = function (val) {
if (val != null) {
self.set('enableThemeSongs', val.toString());
}
val = self.get('enableThemeSongs', false);
if (val) {
return val != 'false';
}
return true;
};
self.enableThemeVideos = function (val) {
if (val != null) {
self.set('enableThemeVideos', val.toString());
}
val = self.get('enableThemeVideos', false);
if (val) {
return val != 'false';
}
return !browser.slow;
};
self.language = function (val) { self.language = function (val) {
if (val != null) { if (val != null) {

View file

@ -55,15 +55,6 @@
${HeaderNavigation} ${HeaderNavigation}
</h1> </h1>
<br /> <br />
<div class="selectContainer">
<select id="selectThemeSong" is="emby-select" label="${LabelEnableThemeSongs}">
<option value="">${OptionAuto}</option>
<option value="1">${OptionYes}</option>
<option value="0">${OptionNo}</option>
</select>
<div class="fieldDescription">${LabelEnableThemeSongsHelp}</div>
</div>
<br />
<div class="fldEnableBackdrops selectContainer"> <div class="fldEnableBackdrops selectContainer">
<select id="selectBackdrop" is="emby-select" label="${LabelEnableBackdrops}"> <select id="selectBackdrop" is="emby-select" label="${LabelEnableBackdrops}">
<option value="">${OptionAuto}</option> <option value="">${OptionAuto}</option>
@ -72,6 +63,13 @@
</select> </select>
<div class="fieldDescription">${LabelEnableBackdropsHelp}</div> <div class="fieldDescription">${LabelEnableBackdropsHelp}</div>
</div> </div>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" id="chkThemeSong"/>
<span>${LabelEnableThemeSongs}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelEnableThemeSongsHelp}</div>
</div>
</div> </div>
<div class="detailSection requiresUserPreferences"> <div class="detailSection requiresUserPreferences">
<h1> <h1>

View file

@ -13,7 +13,7 @@
page.querySelector('.chkDisplayMissingEpisodes').checked = user.Configuration.DisplayMissingEpisodes || false; page.querySelector('.chkDisplayMissingEpisodes').checked = user.Configuration.DisplayMissingEpisodes || false;
page.querySelector('.chkDisplayUnairedEpisodes').checked = user.Configuration.DisplayUnairedEpisodes || false; page.querySelector('.chkDisplayUnairedEpisodes').checked = user.Configuration.DisplayUnairedEpisodes || false;
page.querySelector('#selectThemeSong').value = appStorage.getItem('enableThemeSongs-' + user.Id) || ''; page.querySelector('#chkThemeSong').checked = userSettings.enableThemeSongs();
page.querySelector('#selectBackdrop').value = appStorage.getItem('enableBackdrops-' + user.Id) || ''; page.querySelector('#selectBackdrop').value = appStorage.getItem('enableBackdrops-' + user.Id) || '';
page.querySelector('#selectLanguage').value = userSettings.language() || ''; page.querySelector('#selectLanguage').value = userSettings.language() || '';
@ -29,9 +29,9 @@
if (userSettingsLoaded) { if (userSettingsLoaded) {
userSettings.language(page.querySelector('#selectLanguage').value); userSettings.language(page.querySelector('#selectLanguage').value);
userSettings.enableThemeSongs(page.querySelector('#chkThemeSong').checked);
} }
appStorage.setItem('enableThemeSongs-' + user.Id, page.querySelector('#selectThemeSong').value);
appStorage.setItem('enableBackdrops-' + user.Id, page.querySelector('#selectBackdrop').value); appStorage.setItem('enableBackdrops-' + user.Id, page.querySelector('#selectBackdrop').value);
return ApiClient.updateUserConfiguration(user.Id, user.Configuration); return ApiClient.updateUserConfiguration(user.Id, user.Configuration);