diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css index 404dc04dd8..3cf00055b7 100644 --- a/dashboard-ui/css/mediaplayer-video.css +++ b/dashboard-ui/css/mediaplayer-video.css @@ -40,7 +40,7 @@ .videoTopControls { padding: .7em 1em; background-color: rgba(0, 0, 0, .5); - position: fixed; + position: absolute; left: 0; top: 0; right: 0; @@ -50,7 +50,6 @@ .videoAdvancedControls { text-align: right; vertical-align: top; - float: right; } .videoControls .currentTime { diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index e877bf08a8..3656a4c823 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -219,7 +219,7 @@ showTitle: true, centerText: true, lazy: true, - preferThumb: true, + autoThumb: true, context: 'home' }); html += ''; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 06d7ed5edd..c9e84c4bdc 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -570,7 +570,29 @@ var downloadHeight = 576; - if (options.preferBackdrop && item.BackdropImageTags && item.BackdropImageTags.length) { + if (options.autoThumb && item.ImageTags && item.ImageTags.Primary && item.PrimaryImageAspectRatio && item.PrimaryImageAspectRatio >= 1.5) { + + height = 400; + width = primaryImageAspectRatio ? Math.round(height * primaryImageAspectRatio) : null; + + imgUrl = ApiClient.getImageUrl(item.Id, { + type: "Primary", + height: height, + width: width, + tag: item.ImageTags.Primary + }); + + } + else if (options.autoThumb && item.ImageTags && item.ImageTags.Thumb) { + + imgUrl = ApiClient.getScaledImageUrl(item.Id, { + type: "Thumb", + maxWidth: downloadHeight, + tag: item.ImageTags.Thumb + }); + + } + else if (options.preferBackdrop && item.BackdropImageTags && item.BackdropImageTags.length) { imgUrl = ApiClient.getScaledImageUrl(item.Id, { type: "Backdrop", diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 3380e6e253..1e917e6305 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -280,7 +280,7 @@ $('.btnQueue', elem).on('click', onQueueButtonClick); $('.btnInstantMix', elem).on('click', onInstantMixButtonClick); $('.btnShuffle', elem).on('click', onShuffleButtonClick); - $('.btnPlayTrailer', elem).on('click', onShuffleButtonClick); + $('.btnPlayTrailer', elem).on('click', onTrailerButtonClick); }); e.preventDefault(); @@ -353,6 +353,7 @@ var elems = '.backdropPosterItem,.smallBackdropPosterItem,.portraitPosterItem,.squarePosterItem,.miniBackdropPosterItem'; if ($.browser.mobile) { + this.off('contextmenu.posterItemMenu', elems) .on('contextmenu.posterItemMenu', elems, onPosterItemTapHold); }