mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update subtitle methods
This commit is contained in:
parent
fe7c084ae4
commit
adfc486508
23 changed files with 83 additions and 63 deletions
|
@ -56,7 +56,7 @@
|
||||||
<br />
|
<br />
|
||||||
<div>
|
<div>
|
||||||
<label for="txtServerPort" style="text-align: left;">${LabelServerPort}</label>
|
<label for="txtServerPort" style="text-align: left;">${LabelServerPort}</label>
|
||||||
<input type="number" id="txtServerPort" step="1" min="0" />
|
<input type="number" id="txtServerPort" step="1" min="0" value="8096" />
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
|
|
|
@ -360,7 +360,7 @@
|
||||||
|
|
||||||
@media all and (max-width: 480px) {
|
@media all and (max-width: 480px) {
|
||||||
|
|
||||||
.backdropCard.fullWidthCardOnMobile {
|
.backdropCard {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -575,7 +575,7 @@
|
||||||
|
|
||||||
@media all and (max-width: 480px) {
|
@media all and (max-width: 480px) {
|
||||||
|
|
||||||
.detailPage169Card.fullWidthCardOnMobile {
|
.detailPage169Card {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.ui-page-theme-b:not(.pageWithAbsoluteTabs), .pageWithAbsoluteTabs .pageBackground {
|
.ui-page-theme-b:not(.pageWithAbsoluteTabs), .pageWithAbsoluteTabs .pageBackground {
|
||||||
background-color: #1f1f1f;
|
background-color: #242424;
|
||||||
}
|
}
|
||||||
|
|
||||||
.backdropContainer {
|
.backdropContainer {
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
border-radius: 1000px;
|
border-radius: 1000px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.viewMenuBar .fa, .viewMenuBar paper-icon-button {
|
.viewMenuBar paper-icon-button {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
@ -201,7 +201,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.viewMenuBar, .libraryViewNav {
|
.viewMenuBar, .libraryViewNav {
|
||||||
background-color: #111;
|
background-color: #121212;
|
||||||
}
|
}
|
||||||
|
|
||||||
.paperLibraryViewNav {
|
.paperLibraryViewNav {
|
||||||
|
|
|
@ -185,7 +185,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.channelPrograms, .timeslotHeadersInner {
|
.channelPrograms, .timeslotHeadersInner {
|
||||||
width: 8000px;
|
width: 12000px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.timeslotHeader {
|
.timeslotHeader {
|
||||||
|
@ -269,9 +269,9 @@
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pointerInput .programCellInner:hover {
|
.pointerInput .programCellInner:hover {
|
||||||
background-color: #444;
|
background-color: #444;
|
||||||
}
|
}
|
||||||
|
|
||||||
.timeslotCellInner {
|
.timeslotCellInner {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
@ -312,6 +312,20 @@
|
||||||
top: 7px;
|
top: 7px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1920px) {
|
||||||
|
|
||||||
|
.channelPrograms, .timeslotHeadersInner {
|
||||||
|
width: 10000px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1600px) {
|
||||||
|
|
||||||
|
.channelPrograms, .timeslotHeadersInner {
|
||||||
|
width: 8000px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 600px) {
|
@media (max-width: 600px) {
|
||||||
|
|
||||||
.guideChannelImage {
|
.guideChannelImage {
|
||||||
|
@ -366,4 +380,4 @@
|
||||||
|
|
||||||
.channelList, .programGrid {
|
.channelList, .programGrid {
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -304,7 +304,7 @@ html {
|
||||||
-ms-touch-action: manipulation;
|
-ms-touch-action: manipulation;
|
||||||
touch-action: manipulation;
|
touch-action: manipulation;
|
||||||
/* Prevent white flickering */
|
/* Prevent white flickering */
|
||||||
background-color: #1f1f1f;
|
background-color: #262626;
|
||||||
/* Normalize for different browsers */
|
/* Normalize for different browsers */
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
@ -660,7 +660,7 @@ h1 .imageLink {
|
||||||
.warningFieldDescription {
|
.warningFieldDescription {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
border: 1px solid #f4c63f;
|
border: 1px solid #f4c63f;
|
||||||
background: #ffefaa;
|
background: #fff3a5;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -868,15 +868,8 @@ h1 .imageLink {
|
||||||
}
|
}
|
||||||
|
|
||||||
.directoryPickerHeadline {
|
.directoryPickerHeadline {
|
||||||
border: 1px solid #f7c942;
|
color: #000;
|
||||||
color: #222;
|
background: #fff3a5;
|
||||||
background: #fff9df;
|
|
||||||
background-image: -webkit-gradient(linear,left top,left bottom,from(#fffadf),to(#fff3a5));
|
|
||||||
background-image: -webkit-linear-gradient(#fffadf,#fff3a5);
|
|
||||||
background-image: -moz-linear-gradient(#fffadf,#fff3a5);
|
|
||||||
background-image: -ms-linear-gradient(#fffadf,#fff3a5);
|
|
||||||
background-image: -o-linear-gradient(#fffadf,#fff3a5);
|
|
||||||
background-image: linear-gradient(#fffadf,#fff3a5);
|
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<title>Emby</title>
|
<title>Emby</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="playlistEditorPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-require="scripts/playlistedit" data-backbutton="true">
|
<div id="playlistEditorPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-require="scripts/playlistedit" data-backbutton="true" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="viewSettings">
|
<div class="viewSettings">
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return !AppInfo.isTouchPreferred;
|
||||||
}
|
}
|
||||||
|
|
||||||
function enabled() {
|
function enabled() {
|
||||||
|
|
|
@ -19,8 +19,6 @@
|
||||||
|
|
||||||
var html = '';
|
var html = '';
|
||||||
|
|
||||||
updateFilterControls(page);
|
|
||||||
|
|
||||||
var view = 'Thumb';
|
var view = 'Thumb';
|
||||||
|
|
||||||
if (view == "Thumb") {
|
if (view == "Thumb") {
|
||||||
|
@ -59,10 +57,6 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateFilterControls(page) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
function loadTab(page, index) {
|
function loadTab(page, index) {
|
||||||
|
|
||||||
switch (index) {
|
switch (index) {
|
||||||
|
@ -70,7 +64,6 @@
|
||||||
case 1:
|
case 1:
|
||||||
LibraryBrowser.loadSavedQueryValues('channels', query);
|
LibraryBrowser.loadSavedQueryValues('channels', query);
|
||||||
reloadItems(page);
|
reloadItems(page);
|
||||||
updateFilterControls(page);
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -84,7 +77,7 @@
|
||||||
var tabs = page.querySelector('paper-tabs');
|
var tabs = page.querySelector('paper-tabs');
|
||||||
var pages = page.querySelector('neon-animated-pages');
|
var pages = page.querySelector('neon-animated-pages');
|
||||||
|
|
||||||
LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages);
|
LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages, 1);
|
||||||
|
|
||||||
$(tabs).on('iron-select', function () {
|
$(tabs).on('iron-select', function () {
|
||||||
var selected = this.selected;
|
var selected = this.selected;
|
||||||
|
|
|
@ -2,7 +2,11 @@
|
||||||
|
|
||||||
function reloadItems(page) {
|
function reloadItems(page) {
|
||||||
|
|
||||||
Sections.loadLatestChannelItems(page.querySelector('.latestItems'), Dashboard.getCurrentUserId());
|
Dashboard.showLoadingMsg();
|
||||||
|
|
||||||
|
Sections.loadLatestChannelItems(page.querySelector('.latestItems'), Dashboard.getCurrentUserId()).always(function() {
|
||||||
|
Dashboard.hideLoadingMsg();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadTab(page, index) {
|
function loadTab(page, index) {
|
||||||
|
|
|
@ -1534,7 +1534,9 @@
|
||||||
|
|
||||||
tabs.hideScrollButtons = true;
|
tabs.hideScrollButtons = true;
|
||||||
|
|
||||||
$(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady);
|
$(ownerpage).on('pagebeforeshowready', function() {
|
||||||
|
LibraryBrowser.onTabbedPageBeforeShowReady(this);
|
||||||
|
});
|
||||||
|
|
||||||
$(pages).on('iron-select', function () {
|
$(pages).on('iron-select', function () {
|
||||||
|
|
||||||
|
|
|
@ -67,8 +67,7 @@
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
showDetailsMenu: true,
|
showDetailsMenu: true,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
overlayPlayButton: AppInfo.enableAppLayouts,
|
overlayPlayButton: AppInfo.enableAppLayouts
|
||||||
fullWidthOnMobile: AppInfo.enableAppLayouts
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,8 @@
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
context: 'tv',
|
context: 'tv',
|
||||||
lazy: true,
|
lazy: true,
|
||||||
showDetailsMenu: true
|
showDetailsMenu: true,
|
||||||
|
centerText: true
|
||||||
|
|
||||||
});
|
});
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
|
|
|
@ -76,8 +76,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var viblastKey = 'N8FjNTQ3NDdhZqZhNGI5NWU5ZTI=';
|
|
||||||
|
|
||||||
function requireViblast(callback) {
|
function requireViblast(callback) {
|
||||||
require(['thirdparty/viblast/viblast.js'], function () {
|
require(['thirdparty/viblast/viblast.js'], function () {
|
||||||
|
|
||||||
|
@ -91,7 +89,7 @@
|
||||||
|
|
||||||
function downloadViblastKey(callback) {
|
function downloadViblastKey(callback) {
|
||||||
|
|
||||||
var savedKeyPropertyName = 'viblastkey';
|
var savedKeyPropertyName = 'vbk';
|
||||||
var savedKey = appStorage.getItem(savedKeyPropertyName);
|
var savedKey = appStorage.getItem(savedKeyPropertyName);
|
||||||
if (savedKey) {
|
if (savedKey) {
|
||||||
var deferred = DeferredBuilder.Deferred();
|
var deferred = DeferredBuilder.Deferred();
|
||||||
|
@ -118,7 +116,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function getViblastKey() {
|
function getViblastKey() {
|
||||||
return htmlMediaRenderer.customViblastKey || viblastKey;
|
|
||||||
|
return htmlMediaRenderer.customViblastKey || 'N8FjNTQ3NDdhZqZhNGI5NWU5ZTI=';
|
||||||
}
|
}
|
||||||
|
|
||||||
function getStartTime(url) {
|
function getStartTime(url) {
|
||||||
|
|
|
@ -855,8 +855,7 @@
|
||||||
overlayText: true,
|
overlayText: true,
|
||||||
lazy: true,
|
lazy: true,
|
||||||
showDetailsMenu: true,
|
showDetailsMenu: true,
|
||||||
overlayPlayButton: AppInfo.enableAppLayouts,
|
overlayPlayButton: AppInfo.enableAppLayouts
|
||||||
fullWidthOnMobile: AppInfo.enableAppLayouts
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if (item.Type == "GameSystem") {
|
else if (item.Type == "GameSystem") {
|
||||||
|
|
|
@ -189,7 +189,7 @@
|
||||||
return !LibraryBrowser.enableFullPaperTabs();
|
return !LibraryBrowser.enableFullPaperTabs();
|
||||||
},
|
},
|
||||||
|
|
||||||
configurePaperLibraryTabs: function (ownerpage, tabs, pages) {
|
configurePaperLibraryTabs: function (ownerpage, tabs, pages, defaultTabIndex) {
|
||||||
|
|
||||||
tabs.hideScrollButtons = true;
|
tabs.hideScrollButtons = true;
|
||||||
|
|
||||||
|
@ -235,7 +235,9 @@
|
||||||
$('.libraryViewNav', ownerpage).removeClass('libraryViewNavWithMinHeight');
|
$('.libraryViewNav', ownerpage).removeClass('libraryViewNavWithMinHeight');
|
||||||
}
|
}
|
||||||
|
|
||||||
$(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady);
|
$(ownerpage).on('pagebeforeshowready', function () {
|
||||||
|
LibraryBrowser.onTabbedPageBeforeShowReady(ownerpage, defaultTabIndex);
|
||||||
|
});
|
||||||
|
|
||||||
$(pages).on('iron-select', function () {
|
$(pages).on('iron-select', function () {
|
||||||
|
|
||||||
|
@ -249,8 +251,7 @@
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
onTabbedPageBeforeShowReady: function () {
|
onTabbedPageBeforeShowReady: function (page, defaultTabIndex) {
|
||||||
var page = this;
|
|
||||||
|
|
||||||
var tabs = page.querySelector('paper-tabs');
|
var tabs = page.querySelector('paper-tabs');
|
||||||
var selected = tabs.selected;
|
var selected = tabs.selected;
|
||||||
|
@ -259,7 +260,12 @@
|
||||||
|
|
||||||
Logger.log('selected tab is null, checking query string');
|
Logger.log('selected tab is null, checking query string');
|
||||||
|
|
||||||
selected = parseInt(getParameterByName('tab') || '0');
|
if (!LibraryBrowser.enableFullPaperTabs()) {
|
||||||
|
// Currently not supported in this mode
|
||||||
|
defaultTabIndex = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
selected = parseInt(getParameterByName('tab')) || defaultTabIndex || 0;
|
||||||
|
|
||||||
Logger.log('selected tab will be ' + selected);
|
Logger.log('selected tab will be ' + selected);
|
||||||
|
|
||||||
|
|
|
@ -407,10 +407,10 @@
|
||||||
if (self.supportsTextTracks()) {
|
if (self.supportsTextTracks()) {
|
||||||
|
|
||||||
if (isVlc) {
|
if (isVlc) {
|
||||||
//profile.SubtitleProfiles.push({
|
profile.SubtitleProfiles.push({
|
||||||
// Format: 'srt',
|
Format: 'srt',
|
||||||
// Method: 'External'
|
Method: 'External'
|
||||||
//});
|
});
|
||||||
profile.SubtitleProfiles.push({
|
profile.SubtitleProfiles.push({
|
||||||
Format: 'srt',
|
Format: 'srt',
|
||||||
Method: 'Embed'
|
Method: 'Embed'
|
||||||
|
|
|
@ -101,7 +101,13 @@
|
||||||
var currentTimeout = searchHintTimeout;
|
var currentTimeout = searchHintTimeout;
|
||||||
Dashboard.showLoadingMsg();
|
Dashboard.showLoadingMsg();
|
||||||
|
|
||||||
ApiClient.getSearchHints({ userId: Dashboard.getCurrentUserId(), searchTerm: searchTerm, limit: 30 }).done(function (result) {
|
ApiClient.getSearchHints({
|
||||||
|
|
||||||
|
userId: Dashboard.getCurrentUserId(),
|
||||||
|
searchTerm: searchTerm,
|
||||||
|
limit: 30
|
||||||
|
|
||||||
|
}).done(function (result) {
|
||||||
|
|
||||||
if (currentTimeout == searchHintTimeout) {
|
if (currentTimeout == searchHintTimeout) {
|
||||||
renderSearchResultsInOverlay(elem, result.SearchHints);
|
renderSearchResultsInOverlay(elem, result.SearchHints);
|
||||||
|
|
|
@ -64,8 +64,7 @@
|
||||||
centerText: true,
|
centerText: true,
|
||||||
lazy: true,
|
lazy: true,
|
||||||
showTitle: false,
|
showTitle: false,
|
||||||
overlayPlayButton: AppInfo.enableAppLayouts,
|
overlayPlayButton: AppInfo.enableAppLayouts
|
||||||
fullWidthOnMobile: AppInfo.enableAppLayouts
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -86,8 +86,7 @@
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
showDetailsMenu: true,
|
showDetailsMenu: true,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
overlayPlayButton: AppInfo.enableAppLayouts,
|
overlayPlayButton: AppInfo.enableAppLayouts
|
||||||
fullWidthOnMobile: AppInfo.enableAppLayouts
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -152,7 +151,8 @@
|
||||||
lazy: true,
|
lazy: true,
|
||||||
cardLayout: true,
|
cardLayout: true,
|
||||||
context: 'tv',
|
context: 'tv',
|
||||||
showDetailsMenu: true
|
showDetailsMenu: true,
|
||||||
|
preferThumb: true
|
||||||
});
|
});
|
||||||
|
|
||||||
} else if (view == 'Poster') {
|
} else if (view == 'Poster') {
|
||||||
|
@ -162,11 +162,11 @@
|
||||||
shape: getThumbShape(),
|
shape: getThumbShape(),
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
showParentTitle: true,
|
showParentTitle: true,
|
||||||
overlayText: screenWidth >= 800 && !AppInfo.hasLowImageBandwidth,
|
|
||||||
lazy: true,
|
lazy: true,
|
||||||
context: 'tv',
|
context: 'tv',
|
||||||
showDetailsMenu: true,
|
showDetailsMenu: true,
|
||||||
overlayPlayButton: true
|
overlayPlayButton: true,
|
||||||
|
preferThumb: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
(function ($, document) {
|
(function ($, document) {
|
||||||
|
|
||||||
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
|
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Thumb');
|
||||||
|
|
||||||
var data = {};
|
var data = {};
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,8 @@
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
context: 'tv',
|
context: 'tv',
|
||||||
lazy: true,
|
lazy: true,
|
||||||
showDetailsMenu: true
|
showDetailsMenu: true,
|
||||||
|
centerText: true
|
||||||
|
|
||||||
});
|
});
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
|
|
|
@ -59,9 +59,13 @@ html, body, .ui-btn, .pageTitle {
|
||||||
}
|
}
|
||||||
|
|
||||||
.libraryViewNav .ui-btn-active, .libraryViewNav .iron-selected, .barsMenuButton .fa, .btnActiveCast, .libraryViewNav a:not(.ui-btn-active):hover {
|
.libraryViewNav .ui-btn-active, .libraryViewNav .iron-selected, .barsMenuButton .fa, .btnActiveCast, .libraryViewNav a:not(.ui-btn-active):hover {
|
||||||
color: #E91E63 !important;
|
color: #FF2D55 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.viewMenuBar paper-icon-button {
|
||||||
|
color: #FF2D55 !important;
|
||||||
|
}
|
||||||
|
|
||||||
.libraryViewNav {
|
.libraryViewNav {
|
||||||
border-top: 1px solid #333 !important;
|
border-top: 1px solid #333 !important;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue