fix playlist deletion

This commit is contained in:
Luke Pulverenti 2016-10-13 14:43:47 -04:00
parent 25190fbcec
commit 793cf35f42
4 changed files with 45 additions and 25 deletions

View file

@ -416,12 +416,13 @@ button {
} }
.overflowBackdropCard-scalable { .overflowBackdropCard-scalable {
width: 80%; width: 70%;
max-width: 400px; max-width: 400px;
} }
.overflowSquareCard-scalable { .overflowSquareCard-scalable {
width: 42%; width: 40%;
max-width: 200px;
} }
@media all and (min-width: 420px) { @media all and (min-width: 420px) {
@ -442,22 +443,29 @@ button {
} }
} }
@media all and (min-width: 540px) {
.overflowPortraitCard-scalable {
width: 30%;
}
.overflowBackdropCard-scalable {
width: 64%;
}
.overflowSquareCard-scalable {
width: 30%;
}
}
@media all and (min-width: 640px) { @media all and (min-width: 640px) {
.portraitCard-scalable { .portraitCard-scalable {
width: 25%; width: 25%;
} }
.overflowPortraitCard-scalable {
width: 36%;
}
.overflowBackdropCard-scalable { .overflowBackdropCard-scalable {
width: 60%; width: 56%;
}
.overflowSquareCard-scalable {
width: 30%;
} }
} }
@ -504,7 +512,7 @@ button {
} }
.overflowPortraitCard-scalable { .overflowPortraitCard-scalable {
width: 23%; width: 22%;
} }
.overflowBackdropCard-scalable { .overflowBackdropCard-scalable {

View file

@ -144,28 +144,31 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
return 1; return 1;
case 'overflowPortrait': case 'overflowPortrait':
if (screenWidth >= 1000) { if (screenWidth >= 1000) {
return 100 / 23; return 100 / 22;
} }
if (screenWidth >= 640) { if (screenWidth >= 540) {
return 100 / 36; return 100 / 30;
} }
return 2.5; return 100 / 40;
case 'overflowSquare': case 'overflowSquare':
if (screenWidth >= 1000) { if (screenWidth >= 1000) {
return 100 / 22; return 100 / 22;
} }
if (screenWidth >= 640) { if (screenWidth >= 540) {
return 100 / 30; return 100 / 30;
} }
return 100 / 42; return 100 / 40;
case 'overflowBackdrop': case 'overflowBackdrop':
if (screenWidth >= 1000) { if (screenWidth >= 1000) {
return 100 / 40; return 100 / 40;
} }
if (screenWidth >= 640) { if (screenWidth >= 640) {
return 100 / 60; return 100 / 56;
} }
return 100 / 84; if (screenWidth >= 540) {
return 100 / 64;
}
return 100 / 70;
default: default:
return 4; return 4;
} }

View file

@ -160,7 +160,7 @@ define(['appStorage', 'browser'], function (appStorage, browser) {
var version = window.dashboardVersion || '3.0'; var version = window.dashboardVersion || '3.0';
return { return {
dvrFeatureCode: Dashboard.isConnectMode() ? 'dvr' : 'dvr-l', dvrFeatureCode: 'dvr',
getWindowState: function () { getWindowState: function () {
return document.windowState || 'Normal'; return document.windowState || 'Normal';
}, },

View file

@ -862,14 +862,18 @@
var shape = item.Type == "MusicAlbum" || item.Type == "MusicArtist" ? getSquareShape() : getPortraitShape(); var shape = item.Type == "MusicAlbum" || item.Type == "MusicArtist" ? getSquareShape() : getPortraitShape();
var supportsImageAnalysis = appHost.supports('imageanalysis');
html += cardBuilder.getCardsHtml({ html += cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: shape, shape: shape,
showParentTitle: item.Type == "MusicAlbum", showParentTitle: item.Type == "MusicAlbum",
centerText: true, centerText: !supportsImageAnalysis,
showTitle: item.Type == "MusicAlbum" || item.Type == "Game" || item.Type == "MusicArtist", showTitle: item.Type == "MusicAlbum" || item.Type == "Game" || item.Type == "MusicArtist",
coverImage: item.Type == "MusicAlbum" || item.Type == "MusicArtist", coverImage: item.Type == "MusicAlbum" || item.Type == "MusicArtist",
overlayPlayButton: true overlayPlayButton: true,
cardLayout: supportsImageAnalysis,
vibrant: supportsImageAnalysis
}); });
html += '</div>'; html += '</div>';
@ -928,17 +932,22 @@
} else { } else {
html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap">'; html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap">';
} }
var supportsImageAnalysis = appHost.supports('imageanalysis');
html += cardBuilder.getCardsHtml({ html += cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: shape, shape: shape,
showParentTitle: item.Type == "MusicAlbum", showParentTitle: item.Type == "MusicAlbum",
centerText: true, centerText: !supportsImageAnalysis,
showTitle: item.Type == "MusicAlbum" || item.Type == "Game" || item.Type == "MusicArtist", showTitle: item.Type == "MusicAlbum" || item.Type == "Game" || item.Type == "MusicArtist",
context: context, context: context,
lazy: true, lazy: true,
showDetailsMenu: true, showDetailsMenu: true,
coverImage: item.Type == "MusicAlbum" || item.Type == "MusicArtist", coverImage: item.Type == "MusicAlbum" || item.Type == "MusicArtist",
overlayPlayButton: true overlayPlayButton: true,
cardLayout: supportsImageAnalysis && (item.Type == "MusicAlbum" || item.Type == "Game" || item.Type == "MusicArtist"),
vibrant: supportsImageAnalysis
}); });
html += '</div>'; html += '</div>';