Merge remote-tracking branch 'origin/10.7' into 10.7

This commit is contained in:
crobibero 2020-12-03 07:52:44 -07:00
commit 40d2ceecb3

View File

@ -51,7 +51,7 @@
ApiClient.getPluginConfiguration(TemplateConfig.pluginUniqueId).then(function (config) { ApiClient.getPluginConfiguration(TemplateConfig.pluginUniqueId).then(function (config) {
document.querySelector('#Options').value = config.Options; document.querySelector('#Options').value = config.Options;
document.querySelector('#AnInteger').value = config.AnInteger; document.querySelector('#AnInteger').value = config.AnInteger;
document.getElementById('TrueFalseSetting').checked = config.TrueFalseSetting; document.querySelector('#TrueFalseSetting').checked = config.TrueFalseSetting;
document.querySelector('#AString').value = config.AString; document.querySelector('#AString').value = config.AString;
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
@ -63,7 +63,7 @@
ApiClient.getPluginConfiguration(TemplateConfig.pluginUniqueId).then(function (config) { ApiClient.getPluginConfiguration(TemplateConfig.pluginUniqueId).then(function (config) {
config.Options = document.querySelector('#Options').value; config.Options = document.querySelector('#Options').value;
config.AnInteger = document.querySelector('#AnInteger').value; config.AnInteger = document.querySelector('#AnInteger').value;
config.TrueFalseSetting = document.getElementById('TrueFalseSetting').checked; config.TrueFalseSetting = document.querySelector('#TrueFalseSetting').checked;
config.AString = document.querySelector('#AString').value; config.AString = document.querySelector('#AString').value;
ApiClient.updatePluginConfiguration(TemplateConfig.pluginUniqueId, config).then(function (result) { ApiClient.updatePluginConfiguration(TemplateConfig.pluginUniqueId, config).then(function (result) {
Dashboard.processPluginConfigurationUpdateResult(result); Dashboard.processPluginConfigurationUpdateResult(result);