From 3a9de3f7094df7b032025cd900225f888710edc4 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 7 Feb 2020 00:26:46 -0500 Subject: [PATCH 01/14] Alter hardware acceleration message Don't say this is "experimental" since it's not. Mention the documentation on configuring hardware acceleration and that it requires additional configuration. --- src/strings/en-us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index c9c00f0da4..755f890737 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -652,7 +652,7 @@ "LabelH264Crf": "H264 encoding CRF:", "LabelH264EncodingPreset": "H264 encoding preset:", "LabelHardwareAccelerationType": "Hardware acceleration:", - "LabelHardwareAccelerationTypeHelp": "This is an experimental feature only available on supported systems.", + "LabelHardwareAccelerationTypeHelp": "Hardware acceleration requires additional configuration - please see the documentation at https://docs.jellyfin.org/general/administration/hardware-acceleration.html", "LabelHomeNetworkQuality": "Home network quality:", "LabelHomeScreenSectionValue": "Home screen section {0}:", "LabelHttpsPort": "Local HTTPS port number:", From 07268df35a9ad683352b15a6b0b675257ebec295 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sun, 16 Feb 2020 22:06:37 +0300 Subject: [PATCH 02/14] Simplify expression --- src/components/scrollManager.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/scrollManager.js b/src/components/scrollManager.js index 57107ed185..ba000ed954 100644 --- a/src/components/scrollManager.js +++ b/src/components/scrollManager.js @@ -158,11 +158,20 @@ define(["dom", "browser", "layoutManager"], function (dom, browser, layoutManage */ function getScrollableParent(element, vertical) { if (element) { + var nameScroll = "scrollWidth"; + var nameClient = "clientWidth"; + var nameClass = "scrollX"; + + if (vertical) { + nameScroll = "scrollHeight"; + nameClient = "clientHeight"; + nameClass = "scrollY"; + } + var parent = element.parentElement; while (parent) { - if ((!vertical && parent.scrollWidth > parent.clientWidth && parent.classList.contains("scrollX")) || - (vertical && parent.scrollHeight > parent.clientHeight && parent.classList.contains("scrollY"))) { + if (parent[nameScroll] > parent[nameClient] && parent.classList.contains(nameClass)) { return parent; } From 6ad85b3c45020a78ac105b2db72d81d8d969d48e Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sun, 16 Feb 2020 22:08:08 +0300 Subject: [PATCH 03/14] Disable scrollManager on emby-scroller --- src/components/scrollManager.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/scrollManager.js b/src/components/scrollManager.js index ba000ed954..4ba696d744 100644 --- a/src/components/scrollManager.js +++ b/src/components/scrollManager.js @@ -171,7 +171,9 @@ define(["dom", "browser", "layoutManager"], function (dom, browser, layoutManage var parent = element.parentElement; while (parent) { - if (parent[nameScroll] > parent[nameClient] && parent.classList.contains(nameClass)) { + // Skip 'emby-scroller' because it scrolls by itself + if (!parent.classList.contains("emby-scroller") && + parent[nameScroll] > parent[nameClient] && parent.classList.contains(nameClass)) { return parent; } From bd596777aaf5ca14322b3ef59704d2d7e13f6463 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com> Date: Tue, 18 Feb 2020 08:13:49 +0300 Subject: [PATCH 04/14] Fix slider update by touch on iPhone/iPad (#807) --- src/elements/emby-slider/emby-slider.js | 36 ++++++++++++++++++------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js index 13472b4d5d..bcadc48b70 100644 --- a/src/elements/emby-slider/emby-slider.js +++ b/src/elements/emby-slider/emby-slider.js @@ -254,24 +254,40 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli cancelable: false })); - // Reset dragging (from 'input' event) so that real dragging can be detected - var range = this; - setTimeout(function () { - range.dragging = false; - }, 0); + // Prevent 'pointermove' and 'click' after 'touch*' + // FIXME: Still have some 'pointermove' and 'click' that bypass 'touchstart' + e.preventDefault(); + }, { + capture: true + }); + + dom.addEventListener(this, 'touchmove', function (e) { + if (!this.touched || e.targetTouches.length !== 1) { + return; + } + + var fraction = mapClientToFraction(this, e.targetTouches[0].clientX); + this.value = mapFractionToValue(this, fraction); + + this.dispatchEvent(new Event('input', { + bubbles: true, + cancelable: false + })); }, { passive: true }); dom.addEventListener(this, 'touchend', function (e) { - if (!this.dragging) { - this.dispatchEvent(new Event('change', { + var range = this; + + setTimeout(function () { + range.touched = false; + + range.dispatchEvent(new Event('change', { bubbles: true, cancelable: false })); - } - - this.touched = false; + }, 0); }, { passive: true }); From 5aae08cab9fff7d6fbbd91c10862068209fbadb1 Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 18 Feb 2020 14:23:42 +0900 Subject: [PATCH 05/14] change string --- src/strings/en-us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 755f890737..c97b2e67a4 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -652,7 +652,7 @@ "LabelH264Crf": "H264 encoding CRF:", "LabelH264EncodingPreset": "H264 encoding preset:", "LabelHardwareAccelerationType": "Hardware acceleration:", - "LabelHardwareAccelerationTypeHelp": "Hardware acceleration requires additional configuration - please see the documentation at https://docs.jellyfin.org/general/administration/hardware-acceleration.html", + "LabelHardwareAccelerationTypeHelp": "Hardware acceleration requires additional configuration.", "LabelHomeNetworkQuality": "Home network quality:", "LabelHomeScreenSectionValue": "Home screen section {0}:", "LabelHttpsPort": "Local HTTPS port number:", From 1eef18c0f162a6a5dbda456e3e7c1f679d2306f0 Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 18 Feb 2020 14:28:36 +0900 Subject: [PATCH 06/14] add link back to acceleration description --- src/encodingsettings.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/encodingsettings.html b/src/encodingsettings.html index 3d67544c0b..682451bed9 100644 --- a/src/encodingsettings.html +++ b/src/encodingsettings.html @@ -20,7 +20,9 @@ -
${LabelHardwareAccelerationTypeHelp}
+
From 62c580f249b91fd5ebca2b12f9cb6570b66e9053 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Mon, 17 Feb 2020 10:55:40 +0000 Subject: [PATCH 07/14] Translated using Weblate (German) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/de/ --- src/strings/de.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/strings/de.json b/src/strings/de.json index 2e338cce62..ac5b84ae76 100644 --- a/src/strings/de.json +++ b/src/strings/de.json @@ -1485,5 +1485,6 @@ "EnableFastImageFadeIn": "Schnelle Bildeinblendung", "LabelPlayerDimensions": "Playerabmessungen:", "LabelDroppedFrames": "Verlorene Frames:", - "LabelCorruptedFrames": "Fehlerhafte Frames:" + "LabelCorruptedFrames": "Fehlerhafte Frames:", + "OptionForceRemoteSourceTranscoding": "Transkodieren von externen Medienquellen erzwingen (z.B. LiveTV)" } From a77b281a9553a0fa2dfc0bf39b376d39edd9054c Mon Sep 17 00:00:00 2001 From: TheGoose Date: Mon, 17 Feb 2020 14:54:57 +0000 Subject: [PATCH 08/14] Translated using Weblate (English (United Kingdom)) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/en_GB/ --- src/strings/en-gb.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json index 6e6a19bfe6..3b3926a258 100644 --- a/src/strings/en-gb.json +++ b/src/strings/en-gb.json @@ -1463,5 +1463,13 @@ "OptionRandom": "Random", "SelectAdminUsername": "Please select a username for the admin account.", "ButtonSplit": "Split", - "HeaderNavigation": "Navigation" + "HeaderNavigation": "Navigation", + "OptionForceRemoteSourceTranscoding": "Force transcoding of remote media sources (like LiveTV)", + "MessageConfirmAppExit": "Do you want to exit?", + "LabelVideoResolution": "Video resolution:", + "LabelStreamType": "Stream type:", + "LabelPlayerDimensions": "Player dimensions:", + "LabelDroppedFrames": "Dropped frames:", + "LabelCorruptedFrames": "Corrupted frames:", + "CopyStreamURLError": "There was an error copying the URL." } From e125ad70572f8496c0fd8db8a419f2e048c1336b Mon Sep 17 00:00:00 2001 From: zibius1 Date: Mon, 17 Feb 2020 16:25:28 +0000 Subject: [PATCH 09/14] Translated using Weblate (French) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/fr/ --- src/strings/fr.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/strings/fr.json b/src/strings/fr.json index a489d053f6..97e2692387 100644 --- a/src/strings/fr.json +++ b/src/strings/fr.json @@ -916,7 +916,7 @@ "MetadataSettingChangeHelp": "Les modifications des paramètres des métadonnées auront une incidence sur le nouveau contenu ajouté. Pour actualiser le contenu existant, ouvrez l'écran des détails et cliquez sur le bouton Actualiser, ou effectuez des actualisations en masse en utilisant le gestionnaire de métadonnées.", "MinutesAfter": "minutes après", "MinutesBefore": "minutes avant", - "Mobile": "Mobile", + "Mobile": "Pour appareil Mobile", "Monday": "Lundi", "MoreFromValue": "Plus de {0}", "MoreUsersCanBeAddedLater": "D'autres utilisateurs pourront être ajoutés ultérieurement à partir du tableau de bord.", @@ -1455,5 +1455,15 @@ "OptionRandom": "Aléatoire", "ButtonSplit": "Séparer", "SelectAdminUsername": "Veuillez choisir un nom d'utilisateur pour le compte administrateur.", - "HeaderNavigation": "Navigation" + "HeaderNavigation": "Navigation", + "OptionForceRemoteSourceTranscoding": "Transcodafe forcé pour source de media à distance (comme Télé)", + "MessageConfirmAppExit": "Sortir?", + "LabelVideoResolution": "Résolution vidéo", + "LabelStreamType": "Type de flux", + "EnableFastImageFadeInHelp": "Activer un transition plus rapide pour images téléchargées", + "EnableFastImageFadeIn": "Transition d'image rapide", + "LabelPlayerDimensions": "Dimension du lecteur", + "LabelDroppedFrames": "Cadre informatique oublié", + "LabelCorruptedFrames": "Cadre informatique corrompu", + "CopyStreamURLError": "Il y a eu une erreur lors de la copie du URL." } From 5256f98c948d037964d6e1ab6dc2a5a74facbf8a Mon Sep 17 00:00:00 2001 From: Alexander Brissman Date: Mon, 17 Feb 2020 16:33:43 +0000 Subject: [PATCH 10/14] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)=20Translation:=20Jellyfin/Jellyfin=20Web=20Tran?= =?UTF-8?q?slate-URL:=20https://translate.jellyfin.org/projects/jellyfin/j?= =?UTF-8?q?ellyfin-web/nb=5FNO/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/strings/nb.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/strings/nb.json b/src/strings/nb.json index 0635b5ee25..a952175d80 100644 --- a/src/strings/nb.json +++ b/src/strings/nb.json @@ -434,7 +434,7 @@ "LabelCustomCssHelp": "Bruk tilpasset CSS-kode for å endre stil på web-grensesnittet.", "LabelCustomDeviceDisplayName": "Visningsnavn:", "LabelCustomDeviceDisplayNameHelp": "Oppgi et egendefinert visningsnavn eller la det være tomt for å bruke navnet som enheten rapporterer.", - "LabelCustomRating": "Egen anmeldelse:", + "LabelCustomRating": "Egen aldersgrense:", "LabelDateAdded": "Dato lagt til:", "LabelDateAddedBehavior": "Hvordan bestemme \"Dato lagt til\" for nytt innhold:", "LabelDateAddedBehaviorHelp": "Hvis en metadataverdi finnes, vil den alltid bli brukt fremfor noen av disse valgene.", @@ -1463,5 +1463,6 @@ "LabelPlayerDimensions": "Dimensjoner på avspiller:", "LabelCorruptedFrames": "Korrupte bilder:", "LabelStreamType": "Type strøm:", - "LabelDroppedFrames": "Fortapte bilder:" + "LabelDroppedFrames": "Fortapte bilder:", + "OptionForceRemoteSourceTranscoding": "Tvunget omkoding av eksterne media-kilder (som Direkte-TV)" } From 5a1f3c1614ac3548dfb48cd64fb3a045b9d17194 Mon Sep 17 00:00:00 2001 From: nextlooper42 Date: Mon, 17 Feb 2020 09:05:59 +0000 Subject: [PATCH 11/14] Translated using Weblate (Slovak) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/sk/ --- src/strings/sk.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/strings/sk.json b/src/strings/sk.json index 1967ed310c..0390eb9073 100644 --- a/src/strings/sk.json +++ b/src/strings/sk.json @@ -1464,5 +1464,6 @@ "LabelPlayerDimensions": "Rozmery prehrávača:", "LabelDroppedFrames": "Vynechané snímky:", "LabelCorruptedFrames": "Poškodené snímky:", - "CopyStreamURLError": "Pri kopírovaní URL nastala chyba." + "CopyStreamURLError": "Pri kopírovaní URL nastala chyba.", + "OptionForceRemoteSourceTranscoding": "Vynútiť transkódovanie vzdialených mediálnych zdrojov (ako napr. živá TV)" } From b8c90dcc7fe091c0c905b1e5bfcaf7c0afaae3c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Tue, 18 Feb 2020 16:46:17 +0100 Subject: [PATCH 12/14] Fix dashboard padding --- src/dashboard.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dashboard.html b/src/dashboard.html index 4888c1110f..7180b94872 100644 --- a/src/dashboard.html +++ b/src/dashboard.html @@ -2,7 +2,7 @@