From 82dd13a82cca29901aa89aea6704764ec23434eb Mon Sep 17 00:00:00 2001 From: LaShonda Hopper Date: Fri, 1 Dec 2017 15:47:58 -0500 Subject: [PATCH] [Case 7049] Fixes superfluous fields issue with Particle Effects (details below). When creating or selecting an object entityProperties.html's properties-list is updated to have and entity type specific class. This class is used within edit-style.css to specify rules for the Properties Tab when a certain type of entity is currently selected. This resolves the issue with duplicate/misleading color fields for Particle Effects by adding .ParticleEffectMenu rules to edit-style.css to control the visible sections. When the Properties Tab is in the ParticleEffectMenu mode only the following sections are shown (listed as ordered): General Section Collision Section Physical Section Spatial Section Behavior Section Changes Committed: modified: scripts/system/html/css/edit-style.css modified: scripts/system/html/js/entityProperties.js --- scripts/system/html/css/edit-style.css | 31 ++++++++++++++++++++++ scripts/system/html/js/entityProperties.js | 2 ++ 2 files changed, 33 insertions(+) diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css index aad42ca85c..736d42d593 100644 --- a/scripts/system/html/css/edit-style.css +++ b/scripts/system/html/css/edit-style.css @@ -1415,6 +1415,9 @@ input#reset-to-natural-dimensions { } /* ----- Order of Menu items for Primitive ----- */ +/* Entity Menu classes are specified by selected entity + within entityProperties.js +*/ #properties-list.ShapeMenu #general, #properties-list.BoxMenu #general, #properties-list.SphereMenu #general { @@ -1469,6 +1472,34 @@ input#reset-to-natural-dimensions { display: none; } +/* ----- ParticleEffectMenu ----- */ +#properties-list.ParticleEffectMenu #general { + order: 1; +} +#properties-list.ParticleEffectMenu #collision-info { + order: 2; +} +#properties-list.ParticleEffectMenu #physical { + order: 3; +} +#properties-list.ParticleEffectMenu #spatial { + order: 4; +} +#properties-list.ParticleEffectMenu #behavior { + order: 5; +} + +/* items to hide */ +#properties-list.ParticleEffectMenu #base-color-section, +#properties-list.ParticleEffectMenu #hyperlink, +#properties-list.ParticleEffectMenu #light, +#properties-list.ParticleEffectMenu #model, +#properties-list.ParticleEffectMenu #shape-list, +#properties-list.ParticleEffectMenu #text, +#properties-list.ParticleEffectMenu #web, +#properties-list.ParticleEffectMenu #zone { + display: none; +} /* ----- Order of Menu items for Light ----- */ #properties-list.LightMenu #general { diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js index d4ac014c04..4475e010bb 100644 --- a/scripts/system/html/js/entityProperties.js +++ b/scripts/system/html/js/entityProperties.js @@ -780,7 +780,9 @@ function loaded() { lastEntityID = '"' + properties.id + '"'; elID.value = properties.id; + // Create class name for css ruleset filtering elPropertiesList.className = properties.type + 'Menu'; + elType.innerHTML = properties.type; elTypeIcon.innerHTML = ICON_FOR_TYPE[properties.type]; elTypeIcon.style.display = "inline-block";