Compare commits

..

2 Commits

Author SHA1 Message Date
CodeDevMLH
8170abdc94 Update manifest.json for release v1.5.0.11 [skip ci] 2026-02-09 14:56:05 +00:00
CodeDevMLH
535c0e17bf Add upstream trailer layout feature and update version to 1.5.0.11
All checks were successful
Auto Release Plugin / build-and-release (push) Successful in 52s
2026-02-09 15:55:14 +01:00
6 changed files with 125 additions and 25 deletions

View File

@@ -36,6 +36,7 @@ namespace Jellyfin.Plugin.MediaBarEnhanced.Configuration
public bool EnableSeasonalContent { get; set; } = false; public bool EnableSeasonalContent { get; set; } = false;
public bool IsEnabled { get; set; } = true; public bool IsEnabled { get; set; } = true;
public bool EnableClientSideSettings { get; set; } = false; public bool EnableClientSideSettings { get; set; } = false;
public bool EnableUpstreamTrailerLayout { get; set; } = false;
public string SortBy { get; set; } = "Random"; public string SortBy { get; set; } = "Random";
public string SortOrder { get; set; } = "Ascending"; public string SortOrder { get; set; } = "Ascending";
} }

View File

@@ -73,6 +73,14 @@
</label> </label>
<div class="fieldDescription">Delay slide transition until trailer finishes.</div> <div class="fieldDescription">Delay slide transition until trailer finishes.</div>
</div> </div>
<div id="UpstreamTrailerLayoutContainer" class="checkboxContainer checkboxContainer-withDescription">
<label>
<input is="emby-checkbox" type="checkbox" id="EnableUpstreamTrailerLayout"
name="EnableUpstreamTrailerLayout" />
<span>Enable Upstream Trailer Layout</span>
</label>
<div class="fieldDescription">Use the upstream (original) layout for trailers. This renders the video inside a container overlaying the backdrop, instead of replacing it to support full-width video.</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription"> <div class="checkboxContainer checkboxContainer-withDescription">
<label> <label>
<input is="emby-checkbox" type="checkbox" id="EnableMobileVideo" <input is="emby-checkbox" type="checkbox" id="EnableMobileVideo"
@@ -406,7 +414,7 @@
'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls', 'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen', 'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder', 'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
'PreferLocalTrailers' 'PreferLocalTrailers', 'EnableUpstreamTrailerLayout'
]; ];
keys.forEach(function (key) { keys.forEach(function (key) {
@@ -443,12 +451,15 @@
// Handle Prefer Local Trailers visibility // Handle Prefer Local Trailers visibility
var enableVideoBackdropCheckbox = page.querySelector('#EnableVideoBackdrop'); var enableVideoBackdropCheckbox = page.querySelector('#EnableVideoBackdrop');
var preferLocalContainer = page.querySelector('#PreferLocalTrailersContainer'); var preferLocalContainer = page.querySelector('#PreferLocalTrailersContainer');
var upstreamLayoutContainer = page.querySelector('#UpstreamTrailerLayoutContainer');
function updatePreferLocalVisibility() { function updatePreferLocalVisibility() {
if (enableVideoBackdropCheckbox && enableVideoBackdropCheckbox.checked) { if (enableVideoBackdropCheckbox && enableVideoBackdropCheckbox.checked) {
if (preferLocalContainer) preferLocalContainer.style.display = 'block'; if (preferLocalContainer) preferLocalContainer.style.display = 'block';
if (upstreamLayoutContainer) upstreamLayoutContainer.style.display = 'block';
} else { } else {
if (preferLocalContainer) preferLocalContainer.style.display = 'none'; if (preferLocalContainer) preferLocalContainer.style.display = 'none';
if (upstreamLayoutContainer) upstreamLayoutContainer.style.display = 'none';
} }
} }
@@ -473,7 +484,7 @@
'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls', 'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen', 'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder', 'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
'PreferLocalTrailers' 'PreferLocalTrailers', 'EnableUpstreamTrailerLayout'
]; ];
keys.forEach(function (key) { keys.forEach(function (key) {

View File

@@ -12,7 +12,7 @@
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> --> <!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
<Title>Jellyfin Media Bar Enhanced Plugin</Title> <Title>Jellyfin Media Bar Enhanced Plugin</Title>
<Authors>CodeDevMLH</Authors> <Authors>CodeDevMLH</Authors>
<Version>1.5.0.10</Version> <Version>1.5.0.11</Version>
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl> <RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
</PropertyGroup> </PropertyGroup>

View File

@@ -343,6 +343,45 @@
z-index: 1; z-index: 1;
} }
.video-container {
position: absolute;
top: 0;
right: 0;
height: 100%;
width: 0;
z-index: 2;
overflow: hidden;
transition:
width 0.5s ease-in-out,
opacity 0.5s ease-in-out;
opacity: 0;
pointer-events: none;
mask-image:
linear-gradient(to right, transparent 10%, black 30%),
linear-gradient(to top, transparent 2%, rgba(0, 0, 0, 0.5) 6%, black 8%);
-webkit-mask-image:
linear-gradient(to right, transparent 10%, black 30%),
linear-gradient(to top, transparent 2%, rgba(0, 0, 0, 0.5) 6%, black 8%);
mask-composite: intersect;
-webkit-mask-composite: source-in;
}
.video-container.active {
opacity: 1;
pointer-events: auto;
width: 100% !important; /* Force width when active, matching upstream logic behavior */
}
/* Ensure video inside container fills it */
.video-container iframe,
.video-container video {
width: 100%;
height: 100%;
border: none;
}
.backdrop-container { .backdrop-container {
position: absolute; position: absolute;
top: 0%; top: 0%;
@@ -389,6 +428,20 @@
#000000 8%); #000000 8%);
} }
.backdrop.with-video {
width: 100%;
mask-image:
linear-gradient(to top, #fff0 2%, rgb(0 0 0 / 0.5) 6%, #000000 8%),
linear-gradient(to right, black 30%, transparent 85%);
-webkit-mask-image:
linear-gradient(to top, #fff0 2%, rgb(0 0 0 / 0.5) 6%, #000000 8%),
linear-gradient(to right, black 30%, transparent 85%);
mask-composite: source-in;
-webkit-mask-composite: source-in;
}
.backdrop-overlay { .backdrop-overlay {
position: absolute; position: absolute;
top: 0; top: 0;

View File

@@ -52,6 +52,7 @@ const CONFIG = {
customMediaIds: "", customMediaIds: "",
enableLoadingScreen: true, enableLoadingScreen: true,
enableClientSideSettings: false, enableClientSideSettings: false,
enableUpstreamTrailerLayout: false,
sortBy: "Random", sortBy: "Random",
sortOrder: "Ascending", sortOrder: "Ascending",
}; };
@@ -1537,6 +1538,7 @@ const SlideCreator = {
let backdrop; let backdrop;
let isVideo = false; let isVideo = false;
let hasUpstreamVideo = false;
let trailerUrl = null; let trailerUrl = null;
// 1. Check for Remote/Local Trailers // 1. Check for Remote/Local Trailers
@@ -1584,13 +1586,31 @@ const SlideCreator = {
if (isYoutube && videoId) { if (isYoutube && videoId) {
isVideo = true; isVideo = true;
// Create container for YouTube API
const videoClass = CONFIG.fullWidthVideo ? "video-backdrop-full" : "video-backdrop-default"; const videoClass = CONFIG.fullWidthVideo ? "video-backdrop-full" : "video-backdrop-default";
backdrop = SlideUtils.createElement("div", { if (CONFIG.enableUpstreamTrailerLayout) {
className: `backdrop video-backdrop ${videoClass}`, // UPSTREAM LAYOUT: Wrapper Container
id: `youtube-player-${itemId}` const videoContainer = SlideUtils.createElement("div", {
}); className: "video-container",
id: `video-container-${itemId}`
});
const playerDiv = SlideUtils.createElement("div", {
id: `youtube-player-${itemId}`
});
videoContainer.appendChild(playerDiv);
slide.appendChild(videoContainer); // Append container first
isVideo = false;
hasUpstreamVideo = true;
} else {
// ENHANCED LAYOUT: Direct Backdrop Replacement
backdrop = SlideUtils.createElement("div", {
className: `backdrop video-backdrop ${videoClass}`,
id: `youtube-player-${itemId}`
});
}
// Initialize YouTube Player // Initialize YouTube Player
SlideUtils.loadYouTubeIframeAPI().then(() => { SlideUtils.loadYouTubeIframeAPI().then(() => {
@@ -1676,6 +1696,15 @@ const SlideCreator = {
} }
}, },
'onStateChange': (event) => { 'onStateChange': (event) => {
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
const videoContainer = slide ? slide.querySelector('.video-container') : null;
if (event.data === YT.PlayerState.PLAYING) {
if (videoContainer) videoContainer.classList.add('active');
} else {
if (videoContainer) videoContainer.classList.remove('active');
}
if (event.data === YT.PlayerState.ENDED) { if (event.data === YT.PlayerState.ENDED) {
if (CONFIG.waitForTrailerToEnd) { if (CONFIG.waitForTrailerToEnd) {
SlideshowManager.nextSlide(); SlideshowManager.nextSlide();
@@ -1737,12 +1766,30 @@ const SlideCreator = {
SlideshowManager.nextSlide(); SlideshowManager.nextSlide();
} }
}); });
if (CONFIG.enableUpstreamTrailerLayout) {
// Wrap in container
const videoContainer = SlideUtils.createElement("div", {
className: "video-container",
id: `video-container-${itemId}`
});
backdrop.style.position = "";
videoContainer.appendChild(backdrop);
slide.appendChild(videoContainer);
isVideo = false;
hasUpstreamVideo = true;
backdrop.addEventListener('play', () => videoContainer.classList.add('active'));
backdrop.addEventListener('pause', () => videoContainer.classList.remove('active'));
backdrop.addEventListener('ended', () => videoContainer.classList.remove('active'));
}
} }
} }
if (!isVideo) { if (!isVideo) {
backdrop = SlideUtils.createElement("img", { backdrop = SlideUtils.createElement("img", {
className: "backdrop high-quality", className: hasUpstreamVideo ? "backdrop high-quality with-video" : "backdrop high-quality",
src: this.buildImageUrl(item, "Backdrop", 0, serverAddress, 60), src: this.buildImageUrl(item, "Backdrop", 0, serverAddress, 60),
alt: LocalizationUtils.getLocalizedString('Backdrop', 'Backdrop'), alt: LocalizationUtils.getLocalizedString('Backdrop', 'Backdrop'),
loading: "eager", loading: "eager",
@@ -2655,18 +2702,6 @@ const SlideshowManager = {
return; return;
} }
// Only trap keys if focus is on body (neutral) or inside our container.
// To allow standard TV navigation to work for other elements (e.g. library cards).
const activeEl = document.activeElement;
const isBody = activeEl === document.body || !activeEl;
const isInContainer = container.contains(activeEl) || activeEl === container;
if (!isBody && !isInContainer) {
return;
}
const focusElement = document.activeElement;
switch (e.key) { switch (e.key) {
case "ArrowRight": case "ArrowRight":
SlideshowManager.nextSlide(); SlideshowManager.nextSlide();

View File

@@ -9,12 +9,12 @@
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png", "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
"versions": [ "versions": [
{ {
"version": "1.5.0.10", "version": "1.5.0.11",
"changelog": "- fix: keyboard controls in TV mode\n- Add sorting options for content\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 4.0.1 from original repo", "changelog": "- fix: keyboard controls in TV mode\n- Add sorting options for content\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 4.0.1 from original repo",
"targetAbi": "10.11.0.0", "targetAbi": "10.11.0.0",
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.10/Jellyfin.Plugin.MediaBarEnhanced.zip", "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.11/Jellyfin.Plugin.MediaBarEnhanced.zip",
"checksum": "222767e69e240aeaf8a6434819c00637", "checksum": "2cda99e64a771dfd53d640daccd84a39",
"timestamp": "2026-02-09T13:30:59Z" "timestamp": "2026-02-09T14:56:04Z"
}, },
{ {
"version": "1.3.0.3", "version": "1.3.0.3",