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

Merge pull request #14938 from dback2/draggableNumberDisabled

Browse source 
Case 20662: Entity Properties - fix disabling draggable numbers
This commit is contained in:
Shannon Romano 2019-03-07 15:33:21 -08:00 committed by GitHub
commit 37727c8b60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/system/html/js/entityProperties.js
View file

@ -1492,6 +1492,8 @@ const ENTITY_SCRIPT_STATUS = {
unloaded: "Unloaded" unloaded: "Unloaded"
}; };
const ENABLE_DISABLE_SELECTOR = "input, textarea, span, .dropdown dl, .color-picker";
const PROPERTY_NAME_DIVISION = { const PROPERTY_NAME_DIVISION = {
GROUP: 0, GROUP: 0,
PROPERTY: 1, PROPERTY: 1,
@ -1591,8 +1593,7 @@ function disableChildren(el, selector) {
} }
function enableProperties() { function enableProperties() {
enableChildren(document.getElementById("properties-list"), enableChildren(document.getElementById("properties-list"), ENABLE_DISABLE_SELECTOR);
"input, textarea, checkbox, .dropdown dl, .color-picker , .draggable-number.text");
enableChildren(document, ".colpick"); enableChildren(document, ".colpick");
let elLocked = getPropertyInputElement("locked"); let elLocked = getPropertyInputElement("locked");
@ -1603,8 +1604,7 @@ function enableProperties() {
} }
function disableProperties() { function disableProperties() {
disableChildren(document.getElementById("properties-list"), disableChildren(document.getElementById("properties-list"), ENABLE_DISABLE_SELECTOR);
"input, textarea, checkbox, .dropdown dl, .color-picker, .draggable-number.text");
disableChildren(document, ".colpick"); disableChildren(document, ".colpick");
for (let pickKey in colorPickers) { for (let pickKey in colorPickers) {
colorPickers[pickKey].colpickHide(); colorPickers[pickKey].colpickHide();
@ -3356,8 +3356,8 @@ function loaded() {
let shouldHide = selectedEntityProperties.certificateID !== ""; let shouldHide = selectedEntityProperties.certificateID !== "";
if (shouldHide) { if (shouldHide) {
propertyValue = "** Certified **"; propertyValue = "** Certified **";
property.elInput.disabled = true;
} }
property.elInput.disabled = shouldHide;
} }
let isPropertyNotNumber = false; let isPropertyNotNumber = false;