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

Merge pull request #269 from jellyfin/release-10.3.z

Browse source 
Backmerge 10.3.1
This commit is contained in:
Joshua M. Boniface 2019-04-27 21:56:47 -04:00 • committed by GitHub
commit 099fe24f8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/addserver.html
View file

@ -3,7 +3,7 @@
<form class="manualServerForm" style="margin: 0 auto;"> <form class="manualServerForm" style="margin: 0 auto;">
<h1 style="text-align: left;">${HeaderConnectToServer}</h1> <h1 style="text-align: left;">${HeaderConnectToServer}</h1>
<div class="inputContainer"> <div class="inputContainer">
<input is="emby-input" type="url" id="txtServerHost" required="required" label="${LabelServerHost}" /> <input is="emby-input" type="text" id="txtServerHost" required="required" label="${LabelServerHost}" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off" />
<div class="fieldDescription" style="text-align: left;">${LabelServerHostHelp}</div> <div class="fieldDescription" style="text-align: left;">${LabelServerHostHelp}</div>
</div> </div>
<br /> <br />

9
src/components/globalize.js
View file

@ -127,12 +127,17 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana
function loadStrings(options) { function loadStrings(options) {
var locale = getCurrentLocale(); var locale = getCurrentLocale();
var promises = [];
var optionsName;
if (typeof options === 'string') { if (typeof options === 'string') {
return ensureTranslation(allTranslations[options], locale); optionsName = options;
} else { } else {
optionsName = options.name;
register(options); register(options);
return ensureTranslation(allTranslations[options.name], locale);
} }
promises.push(ensureTranslation(allTranslations[optionsName], locale));
promises.push(ensureTranslation(allTranslations[optionsName], fallbackCulture));
return Promise.all(promises);
} }
var cacheParam = new Date().getTime(); var cacheParam = new Date().getTime();

2
src/components/recordingcreator/recordingfields.js
View file

@ -38,7 +38,7 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
var options = instance.options; var options = instance.options;
var apiClient = connectionManager.getApiClient(options.serverId); var apiClient = connectionManager.getApiClient(options.serverId);
instance.querySelector('.recordingFields').classList.remove('hide'); options.parent.querySelector('.recordingFields').classList.remove('hide');
return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) { return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) {
instance.TimerId = program.TimerId; instance.TimerId = program.TimerId;
instance.Status = program.Status; instance.Status = program.Status;