From 935180bf093bf0b39a749c2e92b39a71b219f056 Mon Sep 17 00:00:00 2001
From: Nissim <nissim@highfidelity.io>
Date: Tue, 17 Oct 2017 15:02:05 -0700
Subject: [PATCH] Fixed my bloody stupid mistake...

---
 scripts/system/html/entityProperties.html  |  5 -----
 scripts/system/html/js/entityProperties.js | 17 +----------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 2aa9753c28..2d5dd35e66 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -514,11 +514,6 @@
                 <div class="sub-section-header zone-group zone-section keylight-section">
                     <label>Key Light</label>
                 </div>
-                <form>
-                  <input type="radio" name="keyLightMode" value="inherit" id="property-zone-keylight-mode-inherit" checked> Inherit
-                  <input type="radio" name="keyLightMode" value="disabled" id="property-zone-keylight-mode-disabled"> Off
-                  <input type="radio" name="keyLightMode" value="enabled" id="property-zone-keylight-mode-enabled"> On
-                </form>
                 <div class="zone-section keylight-section zone-group property rgb">
                     <div class="color-picker" id="property-zone-key-light-color"></div>
                     <label>Key light color</label>
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index a0fa5549af..b1e5599dc6 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -660,11 +660,6 @@ function loaded() {
 
         var elZoneSections = document.querySelectorAll(".zone-section");
         allSections.push(elZoneSections);
-
-        var elZoneKeyLightModeInherit = document.getElementById("property-zone-component-mode-inherit");
-        var elZoneKeyLightModeDisabled = document.getElementById("property-zone-component-mode-disabled");
-        var elZoneKeyLightModeEnabled = document.getElementById("property-zone-component-mode-enabled");
-
         var elZoneStageSunModelEnabled = document.getElementById("property-zone-stage-sun-model-enabled");
 
         var elZoneKeyLightColor = document.getElementById("property-zone-key-light-color");
@@ -1030,11 +1025,6 @@ function loaded() {
                             elLightExponent.value = properties.exponent.toFixed(2);
                             elLightCutoff.value = properties.cutoff.toFixed(2);
                         } else if (properties.type == "Zone") {
-
-                            elZoneKeyLightModeInherit.checked = (properties.keyLightMode == 'inherit');
-                            elZoneKeyLightModeDisabled.checked = (properties.keyLightMode == 'disabled');
-                            elZoneKeyLightModeEnabled.checked = (properties.keyLightMode == 'enabled');
-                            
                             elZoneStageSunModelEnabled.checked = properties.stage.sunModelEnabled;
                             elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLight.color.red + "," + properties.keyLight.color.green + "," + properties.keyLight.color.blue + ")";
                             elZoneKeyLightColorRed.value = properties.keyLight.color.red;
@@ -1449,11 +1439,6 @@ function loaded() {
             }
         }));
 
-        var keyLightModeChanged = createZoneComponentModeChangedFunction('keyLightMode', elZoneKeyLightModeInherit, elZoneKeyLightModeDisabled, elZoneKeyLightModeEnabled)
-        elZoneKeyLightModeInherit.addEventListener('change', keyLightModeChanged);
-        elZoneKeyLightModeDisabled.addEventListener('change', keyLightModeChanged);
-        elZoneKeyLightModeEnabled.addEventListener('change', keyLightModeChanged);
-
         elZoneStageSunModelEnabled.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('stage', 'sunModelEnabled'));
         colorPickers.push($('#property-zone-key-light-color').colpick({
             colorScheme: 'dark',
@@ -1482,7 +1467,7 @@ function loaded() {
         elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction);
         elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
 
-        var hazeModeChanged = createHazeModeChangedFunction(elZoneHazeModeInherit, elZoneHazeModeDisabled, elZoneHazeModeEnabled)
+        var hazeModeChanged = createZoneComponentModeChangedFunction('hazeMode', elZoneHazeModeInherit, elZoneHazeModeDisabled, elZoneHazeModeEnabled)
         elZoneHazeModeInherit.addEventListener('change', hazeModeChanged);
         elZoneHazeModeDisabled.addEventListener('change', hazeModeChanged);
         elZoneHazeModeEnabled.addEventListener('change', hazeModeChanged);