mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Always show FFmpeg path in Transcoding page

Browse source 
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.
This commit is contained in:
PloughPuff 2019-02-08 13:16:30 +00:00 • committed by Ploughpuff
parent 8f03439b7e
commit ba2c777772
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/encodingsettings.html
View file

@ -91,10 +91,10 @@
<div class="fieldDescription">${LabelTranscodingThreadCountHelp}</div> <div class="fieldDescription">${LabelTranscodingThreadCountHelp}</div>
</div> </div>
<div class="inputContainer fldEncoderPath hide"> <div class="inputContainer fldEncoderPath">
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<div style="flex-grow:1;"> <div style="flex-grow:1;">
<input is="emby-input" class="txtEncoderPath" label="${LabelffmpegPath}" autocomplete="off" required /> <input is="emby-input" class="txtEncoderPath" label="${LabelffmpegPath}" autocomplete="off" />
</div> </div>
<button type="button" is="paper-icon-button-light" id="btnSelectEncoderPath" class="emby-input-iconbutton"><i class="md-icon">search</i></button> <button type="button" is="paper-icon-button-light" id="btnSelectEncoderPath" class="emby-input-iconbutton"><i class="md-icon">search</i></button>
</div> </div>

2
src/scripts/encodingsettings.js
View file

@ -90,7 +90,7 @@ define(["jQuery", "loading", "globalize", "dom"], function($, loading, globalize
var page = this; var page = this;
ApiClient.getNamedConfiguration("encoding").then(function(config) { ApiClient.getNamedConfiguration("encoding").then(function(config) {
ApiClient.getSystemInfo().then(function(systemInfo) { 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)
}) })
}) })
}) })