mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
add new subtitle preferences
This commit is contained in:
parent
20836ec2f6
commit
dc6dbcf469
4 changed files with 25 additions and 8 deletions
|
@ -760,6 +760,8 @@
|
||||||
audioBitrate: mp4Quality.audioBitrate,
|
audioBitrate: mp4Quality.audioBitrate,
|
||||||
VideoCodec: mp4Quality.videoCodec,
|
VideoCodec: mp4Quality.videoCodec,
|
||||||
AudioCodec: mp4Quality.audioCodec,
|
AudioCodec: mp4Quality.audioCodec,
|
||||||
|
profile: 'baseline',
|
||||||
|
level: '3',
|
||||||
|
|
||||||
// None of the browsers seem to like this
|
// None of the browsers seem to like this
|
||||||
EnableAutoStreamCopy: false
|
EnableAutoStreamCopy: false
|
||||||
|
@ -783,7 +785,9 @@
|
||||||
videoBitrate: m3U8Quality.videoBitrate,
|
videoBitrate: m3U8Quality.videoBitrate,
|
||||||
audioBitrate: m3U8Quality.audioBitrate,
|
audioBitrate: m3U8Quality.audioBitrate,
|
||||||
VideoCodec: m3U8Quality.videoCodec,
|
VideoCodec: m3U8Quality.videoCodec,
|
||||||
AudioCodec: m3U8Quality.audioCodec
|
AudioCodec: m3U8Quality.audioCodec,
|
||||||
|
profile: 'baseline',
|
||||||
|
level: '3'
|
||||||
|
|
||||||
})) + seekParam;
|
})) + seekParam;
|
||||||
|
|
||||||
|
|
|
@ -240,7 +240,6 @@
|
||||||
var deferred = $.Deferred();
|
var deferred = $.Deferred();
|
||||||
|
|
||||||
var sessionQuery = {
|
var sessionQuery = {
|
||||||
SupportsRemoteControl: true,
|
|
||||||
ControllableByUserId: Dashboard.getCurrentUserId()
|
ControllableByUserId: Dashboard.getCurrentUserId()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
$('#chkGroupMoviesIntoCollections', page).checked(user.Configuration.GroupMoviesIntoBoxSets || false).checkboxradio("refresh");
|
$('#chkGroupMoviesIntoCollections', page).checked(user.Configuration.GroupMoviesIntoBoxSets || false).checkboxradio("refresh");
|
||||||
|
|
||||||
$('#selectSubtitlePlaybackMode', page).val(user.Configuration.SubtitleMode || "").selectmenu("refresh");
|
$('#selectSubtitlePlaybackMode', page).val(user.Configuration.SubtitleMode || "").selectmenu("refresh").trigger('change');
|
||||||
$('#chkPlayDefaultAudioTrack', page).checked(user.Configuration.PlayDefaultAudioTrack || false).checkboxradio("refresh");
|
$('#chkPlayDefaultAudioTrack', page).checked(user.Configuration.PlayDefaultAudioTrack || false).checkboxradio("refresh");
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
|
@ -94,7 +94,17 @@
|
||||||
|
|
||||||
window.UserSettingsPage = new userSettingsPage();
|
window.UserSettingsPage = new userSettingsPage();
|
||||||
|
|
||||||
$(document).on('pagebeforeshow', "#userSettingsPage", function () {
|
$(document).on('pageinit', "#userSettingsPage", function () {
|
||||||
|
|
||||||
|
var page = this;
|
||||||
|
|
||||||
|
$('#selectSubtitlePlaybackMode', page).on('change', function () {
|
||||||
|
|
||||||
|
$('.subtitlesHelp', page).hide();
|
||||||
|
$('.subtitles' + this.value + 'Help', page).show();
|
||||||
|
});
|
||||||
|
|
||||||
|
}).on('pagebeforeshow', "#userSettingsPage", function () {
|
||||||
|
|
||||||
var page = this;
|
var page = this;
|
||||||
|
|
||||||
|
|
|
@ -48,11 +48,15 @@
|
||||||
<li>
|
<li>
|
||||||
<label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
|
<label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
|
||||||
<select id="selectSubtitlePlaybackMode" data-mini="true">
|
<select id="selectSubtitlePlaybackMode" data-mini="true">
|
||||||
<option value="Default">{OptionDefaultSubtitles}</option>
|
<option value="Default">${OptionDefaultSubtitles}</option>
|
||||||
<option value="Always">Always</option>
|
<option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
|
||||||
<option value="OnlyForced">OnlyForced</option>
|
<option value="Always">${OptionAlwaysPlaySubtitles}</option>
|
||||||
<option value="None">None</option>
|
<option value="None">${OptionNoSubtitles}</option>
|
||||||
</select>
|
</select>
|
||||||
|
<div class="fieldDescription subtitlesDefaultHelp subtitlesHelp" style="display:none;">${OptionDefaultSubtitlesHelp}</div>
|
||||||
|
<div class="fieldDescription subtitlesAlwaysHelp subtitlesHelp" style="display:none;">${OptionAlwaysPlaySubtitlesHelp}</div>
|
||||||
|
<div class="fieldDescription subtitlesOnlyForcedHelp subtitlesHelp" style="display:none;">${OptionOnlyForcedSubtitlesHelp}</div>
|
||||||
|
<div class="fieldDescription subtitlesNoneHelp subtitlesHelp" style="display:none;">${OptionNoSubtitlesHelp}</div>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<button type="submit" data-theme="b" data-icon="check" data-mini="true">
|
<button type="submit" data-theme="b" data-icon="check" data-mini="true">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue