Merge pull request #14938 from dback2/draggableNumberDisabled

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

View file

@ -1492,6 +1492,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,
@ -1591,8 +1593,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");
@ -1603,8 +1604,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();
@ -3356,8 +3356,8 @@ function loaded() {
let shouldHide = selectedEntityProperties.certificateID !== "";
if (shouldHide) {
propertyValue = "** Certified **";
property.elInput.disabled = true;
}
property.elInput.disabled = shouldHide;
}
let isPropertyNotNumber = false;