From 87a5565e3db1955b780fe90439040efdec0a2b23 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Thu, 21 Jul 2022 16:39:40 -0400 Subject: [PATCH] Code adjustment Accronyms in variable name that must be in uppercase. --- .../entityProperties/html/js/entityProperties.js | 10 +++++----- .../entityProperties/html/js/materialAssistant.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js index 71f3939c56..3b8f218ff3 100644 --- a/scripts/system/create/entityProperties/html/js/entityProperties.js +++ b/scripts/system/create/entityProperties/html/js/entityProperties.js @@ -4472,20 +4472,20 @@ function handleEntitySelectionUpdate(selections, isPropertiesToolUpdate) { let materialDataMultiValue = getMultiplePropertyValue("materialData"); let materialDataTextArea = getPropertyInputElement("materialData"); - let materialJson = null; + let materialJSON = null; if (!materialDataMultiValue.isMultiDiffValue) { try { - materialJson = JSON.parse(materialDataMultiValue.value); + materialJSON = JSON.parse(materialDataMultiValue.value); } catch (e) { } } - if (materialJson !== null && !lockedMultiValue.isMultiDiffValue && !lockedMultiValue.value) { + if (materialJSON !== null && !lockedMultiValue.isMultiDiffValue && !lockedMultiValue.value) { if (materialEditor === null) { createJSONMaterialEditor(); } materialDataTextArea.classList.remove('multi-diff'); - setMaterialEditorJSON(materialJson); + setMaterialEditorJSON(materialJSON); showSaveMaterialDataButton(); hideMaterialDataTextArea(); hideNewJSONMaterialEditorButton(); @@ -4501,7 +4501,7 @@ function handleEntitySelectionUpdate(selections, isPropertiesToolUpdate) { hideMaterialDataSaved(); } - maGetMaterialDataAssistantAvailability(materialJson); + maGetMaterialDataAssistantAvailability(materialJSON); if (hasSelectedEntityChanged && selections.length === 1 && entityTypes[0] === "Material") { requestMaterialTarget(); diff --git a/scripts/system/create/entityProperties/html/js/materialAssistant.js b/scripts/system/create/entityProperties/html/js/materialAssistant.js index a40307ea15..02af601330 100644 --- a/scripts/system/create/entityProperties/html/js/materialAssistant.js +++ b/scripts/system/create/entityProperties/html/js/materialAssistant.js @@ -904,19 +904,19 @@ function maGetRGB(colorArray){ * @param {string or object} materialData - json of the materialData as a string or as an object. */ function maGetMaterialDataAssistantAvailability(materialData) { - var materialDataJson, materialDataString; + var materialDataJSON, materialDataString; if (typeof materialData === "string") { - materialDataJson = JSON.parse(materialData); + materialDataJSON = JSON.parse(materialData); materialDataString = materialData; } else { - materialDataJson = materialData; + materialDataJSON = materialData; materialDataString = JSON.stringify(materialData); } if (getPropertyInputElement("materialURL").value === "materialData" && materialDataString.indexOf("hifi_shader_simple") === -1 && materialDataString.indexOf("glossMap") === -1 && materialDataString.indexOf("specularMap") === -1 && materialDataString.indexOf("bumpMap") === -1 && materialDataString.indexOf("lightMap") === -1 && materialDataString.indexOf("texCoordTransform0") === -1 && materialDataString.indexOf("texCoordTransform1") === -1 && - (materialDataJson.materials === undefined || materialDataJson.materials.length <= 1 || typeof materialDataJson.materials === "object")) { + (materialDataJSON.materials === undefined || materialDataJSON.materials.length <= 1 || typeof materialDataJSON.materials === "object")) { showMaterialAssistantButton(); } else { hideMaterialAssistantButton();