milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #688 from grafixeyehero/fix-backdrop

Browse source 
Fix respect user option backdrop image
This commit is contained in:
Anthony Lavado 2020-01-16 22:25:10 -05:00 • committed by GitHub
commit 01bee79fd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/components/backdrop/backdrop.js
View file

@ -1,4 +1,4 @@
define(['browser', 'connectionManager', 'playbackManager', 'dom', 'css!./backdrop'], function (browser, connectionManager, playbackManager, dom) { define(['browser', 'connectionManager', 'playbackManager', 'dom', "userSettings", 'css!./backdrop'], function (browser, connectionManager, playbackManager, dom, userSettings) {
'use strict'; 'use strict';
function enableAnimation(elem) { function enableAnimation(elem) {
@ -236,16 +236,22 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'css!./backdro
return true; return true;
} }
function enabled() {
return userSettings.enableBackdrops();
}
var rotationInterval; var rotationInterval;
var currentRotatingImages = []; var currentRotatingImages = [];
var currentRotationIndex = -1; var currentRotationIndex = -1;
function setBackdrops(items, imageOptions, enableImageRotation) { function setBackdrops(items, imageOptions, enableImageRotation) {
var images = getImageUrls(items, imageOptions); if (enabled()) {
var images = getImageUrls(items, imageOptions);
if (images.length) { if (images.length) {
startRotation(images, enableImageRotation); startRotation(images, enableImageRotation);
} else { } else {
clearBackdrop(); clearBackdrop();
}
} }
} }
@ -310,4 +316,4 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'css!./backdro
clear: clearBackdrop, clear: clearBackdrop,
externalBackdrop: externalBackdrop externalBackdrop: externalBackdrop
}; };
}); });

16
src/controllers/itemdetailpage.js
View file

@ -1,4 +1,4 @@
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) { 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) {
"use strict"; "use strict";
function getPromise(apiClient, params) { function getPromise(apiClient, params) {
@ -445,17 +445,11 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
} }
} }
function enabled() {
return userSettings.enableBackdrops();
}
function renderBackdrop(page, item, apiClient) { function renderBackdrop(page, item, apiClient) {
if (enabled()) { if (dom.getWindowSize().innerWidth >= 1000) {
if (dom.getWindowSize().innerWidth >= 1000) { backdrop.setBackdrops([item]);
backdrop.setBackdrops([item]); } else {
} else { backdrop.clear();
backdrop.clear();
}
} }
} }