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

use shared usersettings

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-01 23:46:10 -05:00
parent f1eb4b1ad8
commit 5ca7a2ad34
12 changed files with 114 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/scripts/mediaplayer.js
View file

@ -1,4 +1,4 @@
define(['appSettings'], function (appSettings) {
define(['appSettings', 'userSettings'], function (appSettings, userSettings) {
function mediaPlayer() {
@ -600,7 +600,7 @@ define(['appSettings'], function (appSettings) {
Dashboard.showLoadingMsg();
}
if (options.startPositionTicks || firstItem.MediaType !== 'Video' || !appSettings.enableCinemaMode()) {
if (options.startPositionTicks || firstItem.MediaType !== 'Video' || !userSettings.enableCinemaMode()) {
self.playInternal(firstItem, options.startPositionTicks, function () {
self.setPlaylistState(0, items);

6
dashboard-ui/scripts/mypreferencesdisplay.js
View file

@ -1,4 +1,4 @@
define([], function () {
define(['userSettings'], function (userSettings) {
function loadForm(page, user) {
@ -9,7 +9,7 @@
$('#selectThemeSong', page).val(appStorage.getItem('enableThemeSongs-' + user.Id) || '');
$('#selectBackdrop', page).val(appStorage.getItem('enableBackdrops-' + user.Id) || '');
//$('#selectLanguage', page).val(AppSettings.displayLanguage());
$('#selectLanguage', page).val(userSettings.language() || '');
Dashboard.hideLoadingMsg();
}
@ -20,7 +20,7 @@
user.Configuration.DisplayUnairedEpisodes = page.querySelector('.chkDisplayUnairedEpisodes').checked;
user.Configuration.GroupMoviesIntoBoxSets = page.querySelector('.chkGroupMoviesIntoCollections').checked;
//AppSettings.displayLanguage(page.querySelector('#selectLanguage').value);
userSettings.language(page.querySelector('#selectLanguage').value);
appStorage.setItem('enableThemeSongs-' + user.Id, $('#selectThemeSong', page).val());
appStorage.setItem('enableBackdrops-' + user.Id, $('#selectBackdrop', page).val());

6
dashboard-ui/scripts/mypreferenceslanguages.js
View file

@ -1,4 +1,4 @@
define(['appSettings'], function (appSettings) {
define(['appSettings', 'userSettings'], function (appSettings, userSettings) {
function populateLanguages(select, languages) {
@ -31,7 +31,7 @@
$('#selectSubtitlePlaybackMode', page).val(user.Configuration.SubtitleMode || "").trigger('change');
page.querySelector('.chkPlayDefaultAudioTrack').checked = user.Configuration.PlayDefaultAudioTrack || false;
page.querySelector('.chkEnableCinemaMode').checked = appSettings.enableCinemaMode();
page.querySelector('.chkEnableCinemaMode').checked = userSettings.enableCinemaMode();
page.querySelector('.chkExternalVideoPlayer').checked = appSettings.enableExternalPlayers();
require(['qualityoptions'], function (qualityoptions) {
@ -95,7 +95,7 @@
user.Configuration.SubtitleMode = $('#selectSubtitlePlaybackMode', page).val();
user.Configuration.PlayDefaultAudioTrack = page.querySelector('.chkPlayDefaultAudioTrack').checked;
user.Configuration.EnableNextEpisodeAutoPlay = page.querySelector('.chkEpisodeAutoPlay').checked;
appSettings.enableCinemaMode(page.querySelector('.chkEnableCinemaMode').checked);
userSettings.enableCinemaMode(page.querySelector('.chkEnableCinemaMode').checked);
return ApiClient.updateUserConfiguration(user.Id, user.Configuration);
}

26
dashboard-ui/scripts/site.js
View file

@ -1904,6 +1904,7 @@ var AppInfo = {};
define("scrollHelper", [embyWebComponentsBowerPath + "/scrollhelper"], returnFirstDependency);
define("appSettings", [embyWebComponentsBowerPath + "/appsettings"], updateAppSettings);
define("userSettings", [embyWebComponentsBowerPath + "/usersettings"], returnFirstDependency);
// alias
define("historyManager", [], function () {
@ -1934,6 +1935,12 @@ var AppInfo = {};
return Globalize;
});
define('apiClientResolver', [], function () {
return function () {
return window.ApiClient;
};
});
define('dialogText', ['globalize'], getDialogText());
}
@ -1948,25 +1955,6 @@ var AppInfo = {};
return appSettings.get('externalplayers') == 'true';
};
appSettings.enableCinemaMode = function (val) {
if (val != null) {
appSettings.set('enableCinemaMode', val.toString());
}
val = appSettings.get('enableCinemaMode');
if (val) {
return val != 'false';
}
if (browserInfo.mobile) {
return false;
}
return true;
};
return appSettings;
}