1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

better cleanup of recording libraries

This commit is contained in:
Luke Pulverenti 2016-05-20 11:57:07 -04:00
parent 68ad751b25
commit 5514c4dbf4
8 changed files with 224 additions and 112 deletions

View file

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.3.50",
"_release": "1.3.50",
"version": "1.3.51",
"_release": "1.3.51",
"_resolution": {
"type": "version",
"tag": "1.3.50",
"commit": "2c09d5bf9a8f9698095956faca9a8fa55886cb42"
"tag": "1.3.51",
"commit": "0c56ace6eb1ffd23624d7721b3fa8902022e4cc3"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

View file

@ -53,7 +53,6 @@
.actionSheetScroller {
/* Override default style being applied by polymer */
margin-bottom: 0 !important;
flex-grow: 1;
}
.layout-tv .actionSheetScroller {

View file

@ -148,15 +148,8 @@
dlg.classList.add('centered');
}
var enablePaperMenu = !layoutManager.tv;
enablePaperMenu = false;
var itemTagName = 'paper-button';
if (enablePaperMenu) {
html += '<paper-menu>';
itemTagName = 'paper-menu-item';
}
for (var i = 0, length = options.items.length; i < length; i++) {
var option = options.items[i];
@ -174,10 +167,6 @@
html += '</' + itemTagName + '>';
}
if (enablePaperMenu) {
html += '</paper-menu>';
}
if (options.showCancel) {
html += '<div class="buttons">';
html += '<paper-button class="btnCancel">' + globalize.translate('sharedcomponents#ButtonCancel') + '</paper-button>';

View file

@ -190,7 +190,7 @@
return null;
}
function getChannelProgramsHtml(context, date, channel, programs) {
function getChannelProgramsHtml(context, date, channel, programs, options) {
var html = '';
@ -255,20 +255,20 @@
html += '<div class="' + guideProgramNameClass + '">';
if (program.IsLive) {
if (program.IsLive && options.showLiveIndicator) {
html += '<span class="liveTvProgram">' + globalize.translate('sharedcomponents#AttributeLive') + '&nbsp;</span>';
}
else if (program.IsPremiere) {
else if (program.IsPremiere && options.showPremiereIndicator) {
html += '<span class="premiereTvProgram">' + globalize.translate('sharedcomponents#AttributePremiere') + '&nbsp;</span>';
}
else if (program.IsSeries && !program.IsRepeat) {
else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) {
html += '<span class="newTvProgram">' + globalize.translate('sharedcomponents#AttributeNew') + '&nbsp;</span>';
}
html += program.Name;
html += '</div>';
if (program.IsHD) {
if (program.IsHD && options.showHdIcon) {
html += '<iron-icon class="guideHdIcon" icon="mediainfo:hd"></iron-icon>';
}
@ -295,9 +295,21 @@
var html = [];
// Normally we'd want to just let responsive css handle this,
// but since mobile browsers are often underpowered,
// it can help performance to get them out of the markup
var showIndicators = window.innerWidth >= 800;
var options = {
showHdIcon: showIndicators,
showLiveIndicator: showIndicators,
showPremiereIndicator: showIndicators,
showNewIndicator: showIndicators
};
for (var i = 0, length = channels.length; i < length; i++) {
html.push(getChannelProgramsHtml(context, date, channels[i], programs));
html.push(getChannelProgramsHtml(context, date, channels[i], programs, options));
}
var programGrid = context.querySelector('.programGrid');
@ -623,7 +635,7 @@
programGrid.addEventListener('focus', onProgramGridFocus, true);
addEventListenerWithOptions(programGrid, 'scroll', function () {
addEventListenerWithOptions(programGrid, 'scroll', function (e) {
onProgramGridScroll(context, this, timeslotHeaders);
}, {
passive: true