Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-15 18:13:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidy options settings code

Browse source
This commit is contained in:
David Rowe 2017-08-31 13:55:00 +12:00
parent 5299596254
commit 3dacd1fcda
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/vr-edit/modules/toolsMenu.js
View file

@ -2043,15 +2043,10 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
if (value === "" && optionsItems[i].setting.defaultValue !== undefined) {
value = optionsItems[i].setting.defaultValue;
}
// TODO: Regularize use of optionsSettings.
if (optionsItems[i].type === "swatch" || optionsItems[i].id === "currentColor") {
optionsSettings[optionsItems[i].id].value = value;
}
optionsSettings[optionsItems[i].id].value = value;
if (value !== "") {
properties[optionsItems[i].setting.property] = value;
if (optionsItems[i].type === "toggleButton") {
// Store value in optionsSettings rather than using overlay property.
optionsSettings[optionsItems[i].id].value = value;
optionsToggles[optionsItems[i].id] = value;
properties.color = value
? UI_ELEMENTS[optionsItems[i].type].onColor
@ -2059,13 +2054,7 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
if (optionsItems[i].hasOwnProperty("onSublabel")) {
sublabelModifier = value ? optionsItems[i].onSublabel : optionsItems[i].offSublabel;
}
}
if (optionsItems[i].type === "barSlider") {
// Store value in optionsSettings rather than using overlay property.
optionsSettings[optionsItems[i].id].value = value;
}
if (optionsItems[i].type === "picklist") {
optionsSettings[optionsItems[i].id].value = value;
} else if (optionsItems[i].type === "picklist") {
if (value === "custom") {
optionsItems[i].label = optionsItems[i].customLabel;
} else {