milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into es6-subtitlesettings

Browse source 
Signed-off-by: Christoph Potas <christoph286@googlemail.com>

# Conflicts:
#	package.json
#	src/components/subtitlesettings/subtitleappearancehelper.js
#	src/components/subtitlesettings/subtitlesettings.js
#	src/controllers/user/subtitles.js
#	src/scripts/site.js
This commit is contained in:
Christoph Potas 2020-05-09 15:37:07 +02:00
commit 1007308add
328 changed files with 10578 additions and 13979 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/subtitlesettings/subtitlesettings.js
View file

@ -44,8 +44,8 @@ function loadForm(context, user, userSettings, appearanceSettings, apiClient) {
settingsHelper.populateLanguages(selectSubtitleLanguage, allCultures);
selectSubtitleLanguage.value = user.Configuration.SubtitleLanguagePreference || "";
context.querySelector('#selectSubtitlePlaybackMode').value = user.Configuration.SubtitleMode || "";
selectSubtitleLanguage.value = user.Configuration.SubtitleLanguagePreference || '';
context.querySelector('#selectSubtitlePlaybackMode').value = user.Configuration.SubtitleMode || '';
context.querySelector('#selectSubtitlePlaybackMode').dispatchEvent(new CustomEvent('change', {}));