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

Merge pull request #594 from grafixeyehero/backdrop

Browse source 
Fix some issues with the backdrop image
This commit is contained in:
dkanada 2019-11-30 00:06:18 +09:00 • committed by GitHub
commit 78fd41ef05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/themes/blueradiance/theme.css
View file

@ -49,7 +49,7 @@ html {
} }
.backgroundContainer.withBackdrop { .backgroundContainer.withBackdrop {
opacity: .93 opacity: .86
} }
@media (orientation:portrait) { @media (orientation:portrait) {

2
src/components/themes/light/theme.css
View file

@ -48,7 +48,7 @@ html {
} }
.backgroundContainer.withBackdrop { .backgroundContainer.withBackdrop {
background-color: rgba(255, 255, 255, .94) background-color: rgba(255, 255, 255, .80)
} }
.dialog { .dialog {

2
src/components/themes/purple-haze/theme.css
View file

@ -49,7 +49,7 @@ html {
} }
.backgroundContainer.withBackdrop { .backgroundContainer.withBackdrop {
opacity: .93 opacity: .86
} }
@media (orientation:portrait) { @media (orientation:portrait) {

24
src/controllers/itemdetailpage.js
View file

@ -1,4 +1,4 @@
define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuilder", "datetime", "mediaInfo", "backdrop", "listView", "itemContextMenu", "itemHelper", "dom", "indicators", "apphost", "imageLoader", "libraryMenu", "globalize", "browser", "events", "scrollHelper", "playbackManager", "libraryBrowser", "scrollStyles", "emby-itemscontainer", "emby-checkbox", "emby-button", "emby-playstatebutton", "emby-ratingbutton", "emby-scroller", "emby-select"], function (loading, appRouter, layoutManager, connectionManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, dom, indicators, appHost, imageLoader, libraryMenu, globalize, browser, events, scrollHelper, playbackManager, libraryBrowser) { define(["loading", "appRouter", "layoutManager", "userSettings", "connectionManager", "cardBuilder", "datetime", "mediaInfo", "backdrop", "listView", "itemContextMenu", "itemHelper", "dom", "indicators", "apphost", "imageLoader", "libraryMenu", "globalize", "browser", "events", "scrollHelper", "playbackManager", "libraryBrowser", "scrollStyles", "emby-itemscontainer", "emby-checkbox", "emby-button", "emby-playstatebutton", "emby-ratingbutton", "emby-scroller", "emby-select"], function (loading, appRouter, layoutManager, userSettings, connectionManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, dom, indicators, appHost, imageLoader, libraryMenu, globalize, browser, events, scrollHelper, playbackManager, libraryBrowser) {
"use strict"; "use strict";
function getPromise(apiClient, params) { function getPromise(apiClient, params) {
@ -445,6 +445,20 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
} }
} }
function enabled() {
return userSettings.enableBackdrops();
}
function renderBackdrop(page, item, apiClient) {
if (enabled()) {
if (dom.getWindowSize().innerWidth >= 1000) {
backdrop.setBackdrops([item]);
} else {
backdrop.clear();
}
}
}
function renderDetailPageBackdrop(page, item, apiClient) { function renderDetailPageBackdrop(page, item, apiClient) {
var imgUrl; var imgUrl;
var screenWidth = screen.availWidth; var screenWidth = screen.availWidth;
@ -520,13 +534,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
setInitialCollapsibleState(page, item, apiClient, context, user); setInitialCollapsibleState(page, item, apiClient, context, user);
renderDetails(page, item, apiClient, context); renderDetails(page, item, apiClient, context);
renderTrackSelections(page, instance, item); renderTrackSelections(page, instance, item);
renderBackdrop(page, item, apiClient);
if (dom.getWindowSize().innerWidth >= 1000) {
backdrop.setBackdrops([item]);
} else {
backdrop.clear();
}
renderDetailPageBackdrop(page, item, apiClient); renderDetailPageBackdrop(page, item, apiClient);
var canPlay = reloadPlayButtons(page, item); var canPlay = reloadPlayButtons(page, item);