Merge branch 'master' into master

jellyfin · Jan 6, 2025 · 150c162 · 150c162
2 parents 6d01271 + 882b498
commit 150c162
Show file tree

Hide file tree

Showing 14 changed files with 713 additions and 541 deletions.
diff --git a/src/assets/img/devices/webos.svg b/src/assets/img/devices/webos.svg
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
@@ -1224,12 +1224,7 @@ export function buildCards(items, options) {
     if (html) {
         if (options.itemsContainer.cardBuilderHtml !== html) {
             options.itemsContainer.innerHTML = html;
-
-            if (items.length < 50) {
-                options.itemsContainer.cardBuilderHtml = html;
-            } else {
-                options.itemsContainer.cardBuilderHtml = null;
-            }
+            options.itemsContainer.cardBuilderHtml = html;
         }
 
         imageLoader.lazyChildren(options.itemsContainer);

diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js
@@ -222,7 +222,7 @@ function showMenuForSelectedItems(e) {
                 icon: 'check_box_outline_blank'
             });
 
-            // this assues that if the user can refresh metadata for the first item
+            // this assures that if the user can refresh metadata for the first item
             // they can refresh metadata for all items
             if (itemHelper.canRefreshMetadata(firstItem, user)) {
                 menuItems.push({

diff --git a/src/components/upnextdialog/upnextdialog.js b/src/components/upnextdialog/upnextdialog.js
@@ -55,9 +55,16 @@ function setNextVideoText() {
 
     const timeText = '<span class="upNextDialog-countdownText">' + globalize.translate('HeaderSecondsValue', secondsRemaining) + '</span>';
 
-    const nextVideoText = instance.showStaticNextText ?
-        globalize.translate('HeaderNextItem', globalize.translate(instance.itemType)) :
-        globalize.translate('HeaderNextItemPlayingInValue', globalize.translate(instance.itemType), timeText);
+    let nextVideoText;
+    if (instance.itemType === 'Episode') {
+        nextVideoText = instance.showStaticNextText ?
+            globalize.translate('HeaderNextEpisode') :
+            globalize.translate('HeaderNextEpisodePlayingInValue', timeText);
+    } else {
+        nextVideoText = instance.showStaticNextText ?
+            globalize.translate('HeaderNextVideo') :
+            globalize.translate('HeaderNextVideoPlayingInValue', timeText);
+    }
 
     elem.querySelector('.upNextDialog-nextVideoText').innerHTML = nextVideoText;
 }

diff --git a/src/controllers/dashboard/devices/devices.js b/src/controllers/dashboard/devices/devices.js
@@ -99,7 +99,7 @@ function load(page, devices) {
         const iconUrl = imageHelper.getDeviceIcon(device);
 
         if (iconUrl) {
-            deviceHtml += '<div class="cardImage" style="background-image:url(\'' + iconUrl + "');background-size: auto 64%;background-position:center center;\">";
+            deviceHtml += '<div class="cardImage" style="background-image:url(\'' + iconUrl + "');background-size:contain;background-position:center center;background-origin:content-box;padding:1em;\">";
             deviceHtml += '</div>';
         } else {
             deviceHtml += '<span class="cardImageIcon material-icons tablet_android" aria-hidden="true"></span>';

diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
@@ -1501,6 +1501,9 @@ function renderChildren(page, item) {
             }, {
                 name: globalize.translate('Books'),
                 type: 'Book'
+            }, {
+                name: globalize.translate('Collections'),
+                type: 'BoxSet'
             }];
             renderCollectionItems(page, item, collectionItemTypes, result.Items);
         }

diff --git a/src/scripts/browserDeviceProfile.js b/src/scripts/browserDeviceProfile.js
@@ -231,6 +231,7 @@ function supportsVc1(videoTestElement) {
 
 function supportsHdr10(options) {
     return options.supportsHdr10 ?? (false // eslint-disable-line sonarjs/no-redundant-boolean
+            || browser.vidaa
             || browser.tizen
             || browser.web0s
             || browser.safari && ((browser.iOS && browser.iOSVersion >= 11) || browser.osx)
@@ -1120,7 +1121,7 @@ export default function (options) {
         vp9VideoRangeTypes += '|HDR10';
         av1VideoRangeTypes += '|HDR10';
 
-        if (browser.tizenVersion >= 3) {
+        if (browser.tizenVersion >= 3 || browser.vidaa) {
             hevcVideoRangeTypes += '|DOVIWithHDR10';
         }
     }

diff --git a/src/strings/en-us.json b/src/strings/en-us.json
@@ -460,8 +460,10 @@
     "HeaderNewDevices": "New Devices",
     "HeaderNewPlaylist": "New Playlist",
     "HeaderNewRepository": "New Repository",
-    "HeaderNextItem": "Next {0}",
-    "HeaderNextItemPlayingInValue": "Next {0} Playing in {1}",
+    "HeaderNextEpisode": "Next Episode",
+    "HeaderNextEpisodePlayingInValue": "Next Episode Playing in {0}",
+    "HeaderNextVideo": "Next Video",
+    "HeaderNextVideoPlayingInValue": "Next Video Playing in {0}",
     "HeaderNoLyrics": "No lyrics found",
     "HeaderOnNow": "On Now",
     "HeaderOtherItems": "Other Items",