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 remote-tracking branch 'upstream/master' into perfect_slider-2

Browse source
This commit is contained in:
Dmitry Lyzo 2020-02-19 11:11:32 +03:00
commit bafac46a33
26 changed files with 165 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/movies/moviegenres.js
View file

@ -152,7 +152,7 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader
var scrollXClass = "scrollX hiddenScrollX";
if (layoutManager.tv) {
scrollXClass += "smoothScrollX";
scrollXClass += "smoothScrollX padded-top-focusscale padded-bottom-focusscale";
}
html += '<div is="emby-itemscontainer" class="itemsContainer ' + scrollXClass + ' lazy padded-left padded-right" data-id="' + item.Id + '">';

2
src/controllers/movies/moviesrecommended.js
View file

@ -178,6 +178,8 @@ define(["events", "layoutManager", "inputManager", "userSettings", "libraryMenu"
if (layoutManager.tv) {
elem.classList.add("smoothScrollX");
elem.classList.add("padded-top-focusscale");
elem.classList.add("padded-bottom-focusscale");
}
elem.classList.add("scrollX");

2
src/controllers/shows/tvgenres.js
View file

@ -147,7 +147,7 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader
if (enableScrollX()) {
var scrollXClass = "scrollX hiddenScrollX";
if (layoutManager.tv) {
scrollXClass += "smoothScrollX";
scrollXClass += "smoothScrollX padded-top-focusscale padded-bottom-focusscale";
}
html += '<div is="emby-itemscontainer" class="itemsContainer ' + scrollXClass + ' lazy padded-left padded-right" data-id="' + item.Id + '">';
} else {

2
src/controllers/useredit.js
View file

@ -97,6 +97,7 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function ($, loading,
$("#chkEnableAudioPlaybackTranscoding", page).checked(user.Policy.EnableAudioPlaybackTranscoding);
$("#chkEnableVideoPlaybackTranscoding", page).checked(user.Policy.EnableVideoPlaybackTranscoding);
$("#chkEnableVideoPlaybackRemuxing", page).checked(user.Policy.EnablePlaybackRemuxing);
$("#chkForceRemoteSourceTranscoding", page).checked(user.Policy.ForceRemoteSourceTranscoding);
$("#chkRemoteAccess", page).checked(null == user.Policy.EnableRemoteAccess || user.Policy.EnableRemoteAccess);
$("#chkEnableSyncTranscoding", page).checked(user.Policy.EnableSyncTranscoding);
$("#chkEnableConversion", page).checked(user.Policy.EnableMediaConversion || false);
@ -128,6 +129,7 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function ($, loading,
user.Policy.EnableAudioPlaybackTranscoding = $("#chkEnableAudioPlaybackTranscoding", page).checked();
user.Policy.EnableVideoPlaybackTranscoding = $("#chkEnableVideoPlaybackTranscoding", page).checked();
user.Policy.EnablePlaybackRemuxing = $("#chkEnableVideoPlaybackRemuxing", page).checked();
user.Policy.ForceRemoteSourceTranscoding = $("#chkForceRemoteSourceTranscoding", page).checked();
user.Policy.EnableContentDownloading = $("#chkEnableDownloading", page).checked();
user.Policy.EnableSyncTranscoding = $("#chkEnableSyncTranscoding", page).checked();
user.Policy.EnableMediaConversion = $("#chkEnableConversion", page).checked();