Merge pull request #1 from jellyfin/master

Up-to-date
jellyfin · Feb 19, 2020 · e7b4a80 · e7b4a80
2 parents b2e7da7 + 4be2aed
commit e7b4a80
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 24 deletions.
diff --git a/src/components/scrollManager.js b/src/components/scrollManager.js
@@ -158,11 +158,22 @@ 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"))) {
+                // Skip 'emby-scroller' because it scrolls by itself
+                if (!parent.classList.contains("emby-scroller") &&
+                    parent[nameScroll] > parent[nameClient] && parent.classList.contains(nameClass)) {
                     return parent;
                 }
 

diff --git a/src/dashboard.html b/src/dashboard.html
@@ -2,7 +2,7 @@
     <div class="content-primary">
         <div class="dashboardSections" style="padding-top:.5em;">
             <div class="dashboardColumn dashboardColumn-2-60 dashboardColumn-3-46">
-                <div class="dashboardSection" style="padding-left: 0;">
+                <div class="dashboardSection">
                     <a is="emby-linkbutton" href="dashboardgeneral.html" class="button-flat sectionTitleTextButton">
                         <h3>${TabServer}</h3>
                         <i class="material-icons">chevron_right</i>
@@ -31,7 +31,7 @@ <h3>${HeaderRunningTasks}</h3>
                     </div>
                 </div>
 
-                <div class="dashboardSection" style="padding-left: 0;">
+                <div class="dashboardSection">
                     <a is="emby-linkbutton" href="devices.html" class="button-flat sectionTitleTextButton">
                         <h3>${HeaderActiveDevices}</h3>
                         <i class="material-icons">chevron_right</i>

diff --git 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
             });

diff --git a/src/encodingsettings.html b/src/encodingsettings.html
@@ -20,7 +20,9 @@ <h2 class="sectionTitle">${TabTranscoding}</h2>
                         <option value="vaapi">Video Acceleration API (VAAPI)</option>
                         <option value="h264_v4l2m2m">Exynos V4L2 MFC</option>
                     </select>
-                    <div class="fieldDescription">${LabelHardwareAccelerationTypeHelp}</div>
+                    <div class="fieldDescription">
+                        <a is="emby-linkbutton" class="button-link" href="https://docs.jellyfin.org/general/administration/hardware-acceleration.html" target="_blank">${LabelHardwareAccelerationTypeHelp}</a>
+                    </div>
                 </div>
 
                 <div class="inputContainer hide fldVaapiDevice">

diff --git a/src/strings/de.json b/src/strings/de.json
@@ -1487,5 +1487,6 @@
     "EnableFastImageFadeIn": "Schnelle Bildeinblendung",
     "LabelPlayerDimensions": "Playerabmessungen:",
     "LabelDroppedFrames": "Verlorene Frames:",
-    "LabelCorruptedFrames": "Fehlerhafte Frames:"
+    "LabelCorruptedFrames": "Fehlerhafte Frames:",
+    "OptionForceRemoteSourceTranscoding": "Transkodieren von externen Medienquellen erzwingen (z.B. LiveTV)"
 }
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
@@ -1465,5 +1465,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."
 }
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
@@ -655,7 +655,7 @@
     "LabelH264Crf": "H264 encoding CRF:",
     "LabelEncoderPreset": "H264 and H265 encoding preset:",
     "LabelHardwareAccelerationType": "Hardware acceleration:",
-    "LabelHardwareAccelerationTypeHelp": "This is an experimental feature only available on supported systems.",
+    "LabelHardwareAccelerationTypeHelp": "Hardware acceleration requires additional configuration.",
     "LabelHomeNetworkQuality": "Home network quality:",
     "LabelHomeScreenSectionValue": "Home screen section {0}:",
     "LabelHttpsPort": "Local HTTPS port number:",

diff --git a/src/strings/es_DO.json b/src/strings/es_DO.json
@@ -0,0 +1 @@
+{}
diff --git 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."
 }
diff --git 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)"
 }
diff --git a/src/strings/ro.json b/src/strings/ro.json
@@ -1462,5 +1462,6 @@
     "LabelStreamType": "Tipul streamului:",
     "LabelPlayerDimensions": "Dimensiunile soft redare:",
     "LabelDroppedFrames": "Cadre abandonate:",
-    "LabelCorruptedFrames": "Cadre corupte:"
+    "LabelCorruptedFrames": "Cadre corupte:",
+    "OptionForceRemoteSourceTranscoding": "Forțați transcodarea surselor media distante (cum ar fi LiveTV)"
 }
diff --git 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)"
 }