Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 14:52:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist

Browse source
This commit is contained in:
Stephen Birarda 2017-06-14 17:23:12 -07:00
commit 2e5d92a537
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
domain-server/resources/describe-settings.json
View file

@ -1362,6 +1362,7 @@
"label": "Server Type",
"type": "select",
"placeholder": "Audio Mixer",
"default": "Audio Mixer",
"can_set": true,
"options": [
{

13
domain-server/resources/web/settings/js/settings.js
View file

@ -1294,12 +1294,12 @@ function makeTableHiddenInputs(setting, initialValues, categoryValue) {
html += "<select style='display: none;' class='form-control' data-hidden-input='" + col.name + "'>'"
for (var i in col.options) {
var option = col.options[i];
var option = col.options[i];
html += "<option value='" + option.value + "' " + (option.value == defaultValue ? 'selected' : '') + ">" + option.label + "</option>";
}
html += "</select>";
html += "<input type='hidden' class='table-dropdown form-control trigger-change' name='" + col.name + "' value='" + option.value + "'></td>";
html += "</select>";
html += "<input type='hidden' class='table-dropdown form-control trigger-change' name='" + col.name + "' value='" + defaultValue + "'></td>";
} else {
html +=
"<td " + (col.hidden ? "style='display: none;'" : "") + " class='" + Settings.DATA_COL_CLASS + "' " +
@ -1441,8 +1441,11 @@ function addTableRow(row) {
if (isCheckbox) {
input.attr("name", newName)
} else {
if (isDropdown) {
$(element).children("select").attr("data-hidden-input", newName);
if (isDropdown) {
// default values for hidden inputs inside child selects gets cleared so we need to remind it
var selectElement = $(element).children("select");
selectElement.attr("data-hidden-input", newName);
$(element).children("input").val(selectElement.val());
}
input.attr("name", newName);
}