From c6558ebebd07a777c8de6148121ad8a893da5855 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 21 Oct 2016 11:14:57 +1300
Subject: [PATCH] Reinstate "reload" button for entity scripts in entities
 editor

---
 scripts/system/html/entityProperties.html  |  8 ++------
 scripts/system/html/js/entityProperties.js | 16 ----------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 5cc8b67b44..1de59ad135 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -312,15 +312,11 @@
                 <input type="number" id="property-lifetime">
             </div>
             <hr class="behavior-group" />
-            <div class="behavior-group property url ">
-                <!--
-                FIXME: If reload buttons at the end of each URL continue to work OK during beta, this reload button and associated
-                code should be removed.
+            <div class="behavior-group property url refresh">
                 <input type="hidden" id="property-script-timestamp" class="value">
-                <input type="button" id="reload-script-button" value="Reload">
-                -->
                 <label for="property-script-url">Script URL</label>
                 <input type="text" id="property-script-url">
+                <input type="button" id="reload-script-button" class="glyph" value="F">
             </div>
             <div class="section-header model-group model-section zone-section">
                 <label>Model</label><span>M</span>
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 0bcae7f409..a7dfb048b8 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -591,10 +591,7 @@ function loaded() {
 
         var elLifetime = document.getElementById("property-lifetime");
         var elScriptURL = document.getElementById("property-script-url");
-        /*
-        FIXME: See FIXME for property-script-url.
         var elScriptTimestamp = document.getElementById("property-script-timestamp");
-        */
         var elReloadScriptButton = document.getElementById("reload-script-button");
         var elUserData = document.getElementById("property-user-data");
         var elClearUserData = document.getElementById("userdata-clear");
@@ -851,10 +848,7 @@ function loaded() {
                         elCollisionSoundURL.value = properties.collisionSoundURL;
                         elLifetime.value = properties.lifetime;
                         elScriptURL.value = properties.script;
-                        /*
-                        FIXME: See FIXME for property-script-url.
                         elScriptTimestamp.value = properties.scriptTimestamp;
-                        */
 
                         var json = null;
                         try {
@@ -1150,11 +1144,7 @@ function loaded() {
 
         elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime'));
         elScriptURL.addEventListener('change', createEmitTextPropertyUpdateFunction('script'));
-        /*
-        FIXME: See FIXME for property-script-url.
         elScriptTimestamp.addEventListener('change', createEmitNumberPropertyUpdateFunction('scriptTimestamp'));
-        */
-
 
         elClearUserData.addEventListener("click", function() {
             deleteJSONEditor();
@@ -1171,11 +1161,8 @@ function loaded() {
                     properties: properties,
                 })
             );
-
-
         });
 
-
         elSaveUserData.addEventListener("click", function() {
             saveJSONUserData(true);
         });
@@ -1410,15 +1397,12 @@ function loaded() {
                 percentage: parseInt(elRescaleDimensionsPct.value),
             }));
         });
-        /*
-        FIXME: See FIXME for property-script-url.
         elReloadScriptButton.addEventListener("click", function() {
             EventBridge.emitWebEvent(JSON.stringify({
                 type: "action",
                 action: "reloadScript"
             }));
         });
-        */
 
         window.onblur = function() {
             // Fake a change event