From e46b9479131bd6ffa1840ced1de938918b14797d Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 15 Feb 2019 15:31:11 -0800
Subject: [PATCH] properly disable draggable numbers, fix disable script and
collision sound
---
scripts/system/html/js/entityProperties.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index c1a8f363b5..32b576c1f5 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1485,6 +1485,8 @@ const ENTITY_SCRIPT_STATUS = {
unloaded: "Unloaded"
};
+const ENABLE_DISABLE_SELECTOR = "input, textarea, span, .dropdown dl, .color-picker";
+
const PROPERTY_NAME_DIVISION = {
GROUP: 0,
PROPERTY: 1,
@@ -1584,8 +1586,7 @@ function disableChildren(el, selector) {
}
function enableProperties() {
- enableChildren(document.getElementById("properties-list"),
- "input, textarea, checkbox, .dropdown dl, .color-picker , .draggable-number.text");
+ enableChildren(document.getElementById("properties-list"), ENABLE_DISABLE_SELECTOR);
enableChildren(document, ".colpick");
let elLocked = getPropertyInputElement("locked");
@@ -1596,8 +1597,7 @@ function enableProperties() {
}
function disableProperties() {
- disableChildren(document.getElementById("properties-list"),
- "input, textarea, checkbox, .dropdown dl, .color-picker, .draggable-number.text");
+ disableChildren(document.getElementById("properties-list"), ENABLE_DISABLE_SELECTOR);
disableChildren(document, ".colpick");
for (let pickKey in colorPickers) {
colorPickers[pickKey].colpickHide();
@@ -3349,8 +3349,8 @@ function loaded() {
let shouldHide = selectedEntityProperties.certificateID !== "";
if (shouldHide) {
propertyValue = "** Certified **";
+ property.elInput.disabled = true;
}
- property.elInput.disabled = shouldHide;
}
let isPropertyNotNumber = false;