From ba2c777772533c3095cf19f16776100bf60ea1a2 Mon Sep 17 00:00:00 2001 From: PloughPuff Date: Fri, 8 Feb 2019 13:16:30 +0000 Subject: [PATCH] Always show FFmpeg path in Transcoding page Removed the 'hide' and 'required' settings from the html to always show the FFmpeg path to user and also allow user to remove a custom path and return to using whatever is available from system $PATH. --- src/encodingsettings.html | 4 ++-- src/scripts/encodingsettings.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/encodingsettings.html b/src/encodingsettings.html index cc4b2360ed..ae0cd83cf6 100644 --- a/src/encodingsettings.html +++ b/src/encodingsettings.html @@ -91,10 +91,10 @@
${LabelTranscodingThreadCountHelp}
-
+
- +
diff --git a/src/scripts/encodingsettings.js b/src/scripts/encodingsettings.js index 7a2461a6bb..392ec22250 100644 --- a/src/scripts/encodingsettings.js +++ b/src/scripts/encodingsettings.js @@ -90,8 +90,8 @@ define(["jQuery", "loading", "globalize", "dom"], function($, loading, globalize var page = this; ApiClient.getNamedConfiguration("encoding").then(function(config) { ApiClient.getSystemInfo().then(function(systemInfo) { - "External" == systemInfo.EncoderLocationType ? (page.querySelector(".fldEncoderPath").classList.add("hide"), page.querySelector(".txtEncoderPath").removeAttribute("required")) : (page.querySelector(".fldEncoderPath").classList.remove("hide"), page.querySelector(".txtEncoderPath").setAttribute("required", "required")), loadPage(page, config, systemInfo) + loadPage(page, config, systemInfo) }) }) }) -}); \ No newline at end of file +});