merge from dev
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user