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

support turning off subtitles

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-29 16:54:40 -05:00
parent 00d9a83ac7
commit 7e45bd999d
5 changed files with 41 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dashboard-ui/css/livetv.css
View file

@ -273,55 +273,55 @@
}
.channelList, .programGrid {
height: 200px;
height: 220px;
}
@media (min-height: 500px) {
.channelList, .programGrid {
height: 250px;
height: 290px;
}
}
@media (min-height: 600px) {
.channelList, .programGrid {
height: 350px;
height: 390px;
}
}
@media (min-height: 700px) {
.channelList, .programGrid {
height: 450px;
height: 490px;
}
}
@media (min-height: 800px) {
.channelList, .programGrid {
height: 550px;
height: 590px;
}
}
@media (min-height: 900px) {
.channelList, .programGrid {
height: 650px;
height: 690px;
}
}
@media (min-height: 1000px) {
.channelList, .programGrid {
height: 750px;
height: 790px;
}
}
@media (min-height: 1100px) {
.channelList, .programGrid {
height: 850px;
height: 890px;
}
}

2
dashboard-ui/library.html
View file

@ -11,7 +11,7 @@
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" class="ui-btn-active">Media Folders</a>
<a href="librarypathmapping.html" data-role="button">Path Mapping</a>
<a href="librarysettings.html" data-role="button">Other Settings</a>
<a href="librarysettings.html" data-role="button">Advanced</a>
</div>
<div class="readOnlyContent">
<p>

2
dashboard-ui/librarypathmapping.html
View file

@ -11,7 +11,7 @@
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="library.html" data-role="button">Media Folders</a>
<a href="#" data-role="button" class="ui-btn-active">Path Mapping</a>
<a href="librarysettings.html" data-role="button">Other Settings</a>
<a href="librarysettings.html" data-role="button">Advanced</a>
</div>
<form id="libraryPathMappingForm">

2
dashboard-ui/librarysettings.html
View file

@ -11,7 +11,7 @@
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="library.html" data-role="button">Media Folders</a>
<a href="librarypathmapping.html" data-role="button">Path Mapping</a>
<a href="#" data-role="button" class="ui-btn-active">Other Settings</a>
<a href="#" data-role="button" class="ui-btn-active">Advanced</a>
</div>
<form id="librarySettingsForm">

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

@ -223,7 +223,7 @@
currentSrc = replaceQueryString(currentSrc, 'AudioStreamIndex', params.AudioStreamIndex);
}
if (params.SubtitleStreamIndex != null) {
currentSrc = replaceQueryString(currentSrc, 'SubtitleStreamIndex', params.SubtitleStreamIndex);
currentSrc = replaceQueryString(currentSrc, 'SubtitleStreamIndex', (params.SubtitleStreamIndex == -1 ? '' : params.SubtitleStreamIndex));
}
var maxWidth = params.MaxWidth || getParameterByName('MaxWidth', currentSrc);
@ -682,7 +682,7 @@
})[0];
var subtitleStream = (item.MediaStreams || []).filter(function (stream) {
return stream.Index === subtitleStreamIndex ;
return stream.Index === subtitleStreamIndex;
})[0];
var canPlayDirect = canPlayVideoDirect(item, videoStream, audioStream, subtitleStream, maxWidth, bitrate);
@ -1781,6 +1781,11 @@
var html = '';
streams.unshift({
Index: -1,
Language: "Off"
});
for (var i = 0, length = streams.length; i < length; i++) {
var stream = streams[i];
@ -1791,13 +1796,22 @@
html += '<div data-index="' + stream.Index + '" class="mediaFlyoutOption">';
}
html += '<img class="mediaFlyoutOptionImage" src="css/images/media/subtitleflyout.png" />';
if (stream.Index != -1) {
html += '<img class="mediaFlyoutOptionImage" src="css/images/media/subtitleflyout.png" />';
} else {
html += '<div class="mediaFlyoutOptionImage"></div>';
}
html += '<div class="mediaFlyoutOptionContent">';
var language = null;
var options = [];
if (stream.Language && stream.Language != "und") {
if (stream.Language == "Off") {
language = "Off";
options.push('&nbsp;');
}
else if (stream.Language && stream.Language != "und") {
var culture = cultures.filter(function (current) {
return current.ThreeLetterISOLanguageName.toLowerCase() == stream.Language.toLowerCase();
@ -1810,8 +1824,6 @@
html += '<div class="mediaFlyoutOptionName">' + (language || 'Unknown language') + '</div>';
var options = [];
if (stream.Codec) {
options.push(stream.Codec);
}