mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
merge from dev
This commit is contained in:
parent
1c8f02ce0f
commit
33b01d778c
911 changed files with 34157 additions and 57125 deletions
|
@ -15,14 +15,14 @@
|
|||
|
||||
var form = this;
|
||||
|
||||
ApiClient.getNamedConfiguration("sync").done(function (config) {
|
||||
ApiClient.getNamedConfiguration("sync").then(function (config) {
|
||||
|
||||
config.TemporaryPath = $('#txtSyncTempPath', form).val();
|
||||
config.UploadSpeedLimitBytes = parseInt(parseFloat(($('#txtUploadSpeedLimit', form).val() || '0')) * 1000000);
|
||||
config.TranscodingCpuCoreLimit = parseInt($('#txtCpuCoreLimit', form).val());
|
||||
config.EnableFullSpeedTranscoding = $('#chkEnableFullSpeedConversion', form).checked();
|
||||
|
||||
ApiClient.updateNamedConfiguration("sync", config).done(Dashboard.processServerConfigurationUpdateResult);
|
||||
ApiClient.updateNamedConfiguration("sync", config).then(Dashboard.processServerConfigurationUpdateResult);
|
||||
});
|
||||
|
||||
// Disable default form submission
|
||||
|
@ -60,7 +60,7 @@
|
|||
|
||||
var page = this;
|
||||
|
||||
ApiClient.getNamedConfiguration("sync").done(function (config) {
|
||||
ApiClient.getNamedConfiguration("sync").then(function (config) {
|
||||
|
||||
loadPage(page, config);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue