Update manifest.json for release v1.5.0.25 [skip ci]

Jellyfin.Plugin.MediaBarEnhanced/Configuration/PluginConfiguration.cs

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

Jellyfin.Plugin.MediaBarEnhanced/Configuration/configPage.html

@@ -73,14 +73,6 @@
                             </label>
                             <div class="fieldDescription">Delay slide transition until trailer finishes.</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">
                             <label>
                                 <input is="emby-checkbox" type="checkbox" id="EnableMobileVideo"
@@ -414,7 +406,7 @@
                             'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
                             'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
                             'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
-                            'PreferLocalTrailers', 'EnableUpstreamTrailerLayout'
+                            'PreferLocalTrailers'
                         ];
 
                         keys.forEach(function (key) {
@@ -451,15 +443,12 @@
                         // Handle Prefer Local Trailers visibility
                         var enableVideoBackdropCheckbox = page.querySelector('#EnableVideoBackdrop');
                         var preferLocalContainer = page.querySelector('#PreferLocalTrailersContainer');
-                        var upstreamLayoutContainer = page.querySelector('#UpstreamTrailerLayoutContainer');
 
                         function updatePreferLocalVisibility() {
                             if (enableVideoBackdropCheckbox && enableVideoBackdropCheckbox.checked) {
                                 if (preferLocalContainer) preferLocalContainer.style.display = 'block';
-                                if (upstreamLayoutContainer) upstreamLayoutContainer.style.display = 'block';
                             } else {
                                 if (preferLocalContainer) preferLocalContainer.style.display = 'none';
-                                if (upstreamLayoutContainer) upstreamLayoutContainer.style.display = 'none';
                             }
                         }
 
@@ -484,7 +473,7 @@
                         'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
                         'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
                         'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
-                        'PreferLocalTrailers', 'EnableUpstreamTrailerLayout'
+                        'PreferLocalTrailers'
                     ];
 
                     keys.forEach(function (key) {

Jellyfin.Plugin.MediaBarEnhanced/Jellyfin.Plugin.MediaBarEnhanced.csproj

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

Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.css

@@ -161,7 +161,7 @@
 
 .homeSectionsContainer {
   position: relative;
-  top: 65vh;
+  margin-top: 65vh;
   z-index: 6;
 }
 
@@ -343,49 +343,6 @@
   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;
-}
-
-.video-player {
-    width: 100%;
-    height: 100%;
-}
-
-/* Ensure video inside container fills it */
-.video-container iframe,
-.video-container video {
-    width: 100%;
-    height: 100%;
-    border: none;
-}
-
 .backdrop-container {
   position: absolute;
   top: 0%;
@@ -422,10 +379,6 @@
   object-position: center 20%;
   border-radius: 5px;
   z-index: 3;
-  transition:
-    width 0.5s ease-in-out,
-    mask-image 0.5s ease-in-out,
-    -webkit-mask-image 0.5s ease-in-out;
   mask-image: linear-gradient(to top,
       #fff0 2%,
       rgb(0 0 0 / 0.5) 6%,
@@ -436,20 +389,6 @@
       #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 {
   position: absolute;
   top: 0;
@@ -1052,4 +991,9 @@
 
 .dots-container .slide-counter {
   margin: 0;
+}
+
+/* Fix scrolling issue in TV mode - preserve space for slideshow */
+.layout-tv html, .layout-tv body {
+  scroll-padding-top: 65vh;
 }

Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js

@@ -52,7 +52,6 @@ const CONFIG = {
   customMediaIds: "",
   enableLoadingScreen: true,
   enableClientSideSettings: false,
-  enableUpstreamTrailerLayout: false,
   sortBy: "Random",
   sortOrder: "Ascending",
 };
@@ -86,6 +85,7 @@ const STATE = {
     isMuted: CONFIG.startMuted,
     customTrailerUrls: {},
     ytPromise: null,
+    autoplayTimeouts: [],
   },
 };
 
@@ -606,7 +606,10 @@ const SlideUtils = {
   getOrCreateSlidesContainer() {
     let container = document.getElementById("slides-container");
     if (!container) {
-      container = this.createElement("div", { id: "slides-container" });
+      container = this.createElement("div", { 
+        id: "slides-container",
+        className: "noautofocus"
+      });
       document.body.appendChild(container);
     }
     return container;
@@ -1414,6 +1417,24 @@ class SlideTimer {
  */
 const VisibilityObserver = {
   updateVisibility() {
+    const videoPlayer = document.querySelector('.videoPlayerContainer');
+    const trailerPlayer = document.querySelector('.youtubePlayerContainer');
+    
+    // If a full screen video player is active, hide slideshow and stop playback
+    if ((videoPlayer && !videoPlayer.classList.contains('hide')) || (trailerPlayer && !trailerPlayer.classList.contains('hide'))) {
+        const container = document.getElementById("slides-container");
+        if (container) {
+            container.style.display = "none";
+            container.style.visibility = "hidden";
+            container.style.pointerEvents = "none";
+        }
+        if (STATE.slideshow.slideInterval) {
+            STATE.slideshow.slideInterval.stop();
+        }
+        SlideshowManager.stopAllPlayback();
+        return;
+    }
+
     const activeTab = document.querySelector(".emby-tab-button-active");
     const container = document.getElementById("slides-container");
 
@@ -1538,7 +1559,6 @@ const SlideCreator = {
 
     let backdrop;
     let isVideo = false;
-    let hasUpstreamVideo = false;
     let trailerUrl = null;
 
     // 1. Check for Remote/Local Trailers
@@ -1586,31 +1606,13 @@ const SlideCreator = {
 
       if (isYoutube && videoId) {
         isVideo = true;
+        // Create container for YouTube API
         const videoClass = CONFIG.fullWidthVideo ? "video-backdrop-full" : "video-backdrop-default";
 
-        if (CONFIG.enableUpstreamTrailerLayout) {
-             // UPSTREAM LAYOUT: Wrapper Container
-             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}`
-             });
-        }
+        backdrop = SlideUtils.createElement("div", {
+          className: `backdrop video-backdrop ${videoClass}`,
+          id: `youtube-player-${itemId}`
+        });
 
         // Initialize YouTube Player
         SlideUtils.loadYouTubeIframeAPI().then(() => {
@@ -1677,10 +1679,23 @@ const SlideCreator = {
 
                   // Only play if this is the active slide
                   const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
-                  if (slide && slide.classList.contains('active')) {
+                  const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
+
+                  if (slide && slide.classList.contains('active') && !document.hidden && (!isVideoPlayerOpen || isVideoPlayerOpen.classList.contains('hide'))) {
                     event.target.playVideo();
+                    
                     // Check if it actually started playing after a short delay (handling autoplay blocks)
-                    setTimeout(() => {
+                    const timeoutId = setTimeout(() => {
+                      // Re-check conditions before processing fallback
+                      const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
+                      if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
+                          console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`);
+                          try {
+                            event.target.stopVideo();
+                          } catch (e) { console.warn("Error stopping video in timeout:", e); }
+                          return;
+                      }
+
                       if (event.target.getPlayerState() !== YT.PlayerState.PLAYING &&
                         event.target.getPlayerState() !== YT.PlayerState.BUFFERING) {
                         console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`);
@@ -1689,6 +1704,9 @@ const SlideCreator = {
                       }
                     }, 1000);
 
+                    if (!STATE.slideshow.autoplayTimeouts) STATE.slideshow.autoplayTimeouts = [];
+                    STATE.slideshow.autoplayTimeouts.push(timeoutId);
+
                     // Pause slideshow timer when video starts if configured
                     if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
                       STATE.slideshow.slideInterval.stop();
@@ -1696,19 +1714,7 @@ const SlideCreator = {
                   }
                 },
                 '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 || event.data === YT.PlayerState.BUFFERING) {
-                      if (videoContainer) videoContainer.classList.add('active');
-                  } else {
-                      if (videoContainer && event.data !== YT.PlayerState.BUFFERING) {
-                           videoContainer.classList.remove('active');
-                      }
-                  }
-
                   if (event.data === YT.PlayerState.ENDED) {
-                    if (videoContainer) videoContainer.classList.remove('active');
                     if (CONFIG.waitForTrailerToEnd) {
                       SlideshowManager.nextSlide();
                     } else {
@@ -1717,7 +1723,6 @@ const SlideCreator = {
                   }
                 },
                 'onError': () => {
-                  if (videoContainer) videoContainer.classList.remove('active');
                   // Fallback to next slide on error
                   if (CONFIG.waitForTrailerToEnd) {
                     SlideshowManager.nextSlide();
@@ -1770,34 +1775,12 @@ const SlideCreator = {
             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;
-
-            // Use requestAnimationFrame to ensure listeners attach and class adds correctly
-            requestAnimationFrame(() => {
-                backdrop.addEventListener('play', () => videoContainer.classList.add('active'));
-                backdrop.addEventListener('playing', () => videoContainer.classList.add('active'));
-                backdrop.addEventListener('pause', () => videoContainer.classList.remove('active'));
-                backdrop.addEventListener('ended', () => videoContainer.classList.remove('active'));
-            });
-        }
       }
     }
 
     if (!isVideo) {
       backdrop = SlideUtils.createElement("img", {
-        className: hasUpstreamVideo ? "backdrop high-quality with-video" : "backdrop high-quality",
+        className: "backdrop high-quality",
         src: this.buildImageUrl(item, "Backdrop", 0, serverAddress, 60),
         alt: LocalizationUtils.getLocalizedString('Backdrop', 'Backdrop'),
         loading: "eager",
@@ -2599,15 +2582,26 @@ const SlideshowManager = {
    * Used when navigating away from the home screen
    */
   stopAllPlayback() {
-    // 1. Pause all YouTube players
+    // Clear any pending autoplay timeouts
+    if (STATE.slideshow.autoplayTimeouts) {
+        STATE.slideshow.autoplayTimeouts.forEach(id => clearTimeout(id));
+        STATE.slideshow.autoplayTimeouts = [];
+    }
+
+    // 1. Stop all YouTube players
     if (STATE.slideshow.videoPlayers) {
       Object.values(STATE.slideshow.videoPlayers).forEach(player => {
         try {
-          if (player && typeof player.pauseVideo === 'function') {
+          if (player && typeof player.stopVideo === 'function') {
+            player.stopVideo();
+            if (typeof player.clearVideo === 'function') {
+                player.clearVideo();
+            }
+          } else if (player && typeof player.pauseVideo === 'function') {
             player.pauseVideo();
           }
         } catch (e) {
-          console.warn("Error pausing YouTube player:", e);
+          console.warn("Error pausing/stopping YouTube player:", e);
         }
       });
     }
@@ -2710,40 +2704,76 @@ const SlideshowManager = {
         return;
       }
 
+      const activeElement = document.activeElement;
+      const isTvDevice = window.browser && window.browser.tv;
+      const isTvLayout = window.layoutManager && window.layoutManager.tv;
+      const hasTvClass = document.documentElement.classList.contains('layout-tv') || document.body.classList.contains('layout-tv');
+      const isTvMode = isTvDevice || isTvLayout || hasTvClass;
+
+      // Check Focus State
+      const isBodyFocused = activeElement === document.body;
+      const hasDirectFocus = container.contains(activeElement) || activeElement === container;
+      
+      // Determine if we should handle navigation keys (Arrows, Space, M)
+      // TV Mode: Strict focus required (must be on slideshow)
+      // Desktop Mode: Loose focus allowed (slideshow OR body/nothing focused)
+      const canControlSlideshow = isTvMode ? hasDirectFocus : (hasDirectFocus || isBodyFocused);
+
+      // Check for Input Fields (always ignore typing)
+      const isInputElement = activeElement && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA' || activeElement.isContentEditable);
+      if (isInputElement) return;
+
+      // Check active video players (ignore if video is playing/overlay is open)
+      const videoPlayer = document.querySelector('.videoPlayerContainer');
+      const trailerPlayer = document.querySelector('.youtubePlayerContainer');
+      const isVideoOpen = (videoPlayer && !videoPlayer.classList.contains('hide')) || (trailerPlayer && !trailerPlayer.classList.contains('hide'));
+      if (isVideoOpen) return;
+
       switch (e.key) {
         case "ArrowRight":
-          SlideshowManager.nextSlide();
-          e.preventDefault();
+          if (canControlSlideshow) {
+            SlideshowManager.nextSlide();
+            e.preventDefault();
+          }
           break;
 
         case "ArrowLeft":
-          SlideshowManager.prevSlide();
-          e.preventDefault();
+          if (canControlSlideshow) {
+            SlideshowManager.prevSlide();
+            e.preventDefault();
+          }
           break;
 
         case " ": // Space bar
-          this.togglePause();
-          e.preventDefault();
+          if (canControlSlideshow) {
+            this.togglePause();
+            e.preventDefault();
+          }
           break;
 
         case "m": // Mute toggle
         case "M":
-          this.toggleMute();
-          e.preventDefault();
+          if (canControlSlideshow) {
+            this.toggleMute();
+            e.preventDefault();
+          }
           break;
 
         case "Enter":
-          const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
-          if (currentItemId) {
-             if (window.Emby && window.Emby.Page) {
-               Emby.Page.show(
-                 `/details?id=${currentItemId}&serverId=${STATE.jellyfinData.serverId}`
-               );
-             } else {
-               window.location.href = `#/details?id=${currentItemId}&serverId=${STATE.jellyfinData.serverId}`;
-             }
+          // Enter always requires direct focus on the slideshow to avoid conflicts
+          if (hasDirectFocus) {
+            const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
+            if (currentItemId) {
+               if (window.Emby && window.Emby.Page) {
+                 Emby.Page.show(
+                   `/details?id=${currentItemId}&serverId=${STATE.jellyfinData.serverId}`
+                 );
+               } else {
+                 window.location.href = `#/details?id=${currentItemId}&serverId=${STATE.jellyfinData.serverId}`;
+               }
+            }
+            e.preventDefault();
           }
-          e.preventDefault();
           break;
       }
     });

manifest.json

@@ -9,12 +9,12 @@
     "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
     "versions": [
       {
-        "version": "1.5.0.13",
-        "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",
+        "version": "1.5.0.25",
+        "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",
-        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.13/Jellyfin.Plugin.MediaBarEnhanced.zip",
-        "checksum": "edde0c6d9a681c08ed5b7c8816840858",
-        "timestamp": "2026-02-09T15:21:44Z"
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.25/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "42165f328f780ee3efac2dec23e02b09",
+        "timestamp": "2026-02-10T00:07:05Z"
       },
       {
         "version": "1.3.0.3",