From 71e039951c2e78423506ba85cdde3c301148c4a8 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 13 Jan 2017 12:07:12 -0800
Subject: [PATCH] Add reload server scripts button to edit.js

---
 scripts/system/edit.js                     |  8 +++++++-
 scripts/system/html/entityProperties.html  |  3 ++-
 scripts/system/html/js/entityProperties.js | 14 +++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index afcfd50bb8..3e97c54c43 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1569,7 +1569,7 @@ var PropertiesTool = function (opts) {
                     pushCommandForSelections();
                     selectionManager._update();
                 }
-            } else if (data.action === "reloadScript") {
+            } else if (data.action === "reloadClientScripts") {
                 if (selectionManager.hasSelection()) {
                     var timestamp = Date.now();
                     for (i = 0; i < selectionManager.selections.length; i++) {
@@ -1578,6 +1578,12 @@ var PropertiesTool = function (opts) {
                         });
                     }
                 }
+            } else if (data.action === "reloadServerScripts") {
+                if (selectionManager.hasSelection()) {
+                    for (i = 0; i < selectionManager.selections.length; i++) {
+                        Entities.reloadServerScripts(selectionManager.selections[i]);
+                    }
+                }
             }
         }
     });
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 265e9336d1..07a1b300d1 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -318,9 +318,10 @@
                 <input type="text" id="property-script-url">
                 <input type="button" id="reload-script-button" class="glyph" value="F">
             </div>
-            <div class="behavior-group property url">
+            <div class="behavior-group property url refresh">
                 <label for="property-server-scripts">Server Script URLs</label>
                 <input type="text" id="property-server-scripts">
+                <input type="button" id="reload-server-scripts-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 77d47691ea..ebd1e67677 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -590,8 +590,9 @@ function loaded() {
         var elLifetime = document.getElementById("property-lifetime");
         var elScriptURL = document.getElementById("property-script-url");
         var elScriptTimestamp = document.getElementById("property-script-timestamp");
-        var elReloadScriptButton = document.getElementById("reload-script-button");
+        var elReloadScriptsButton = document.getElementById("reload-script-button");
         var elServerScripts = document.getElementById("property-server-scripts");
+        var elReloadServerScriptsButton = document.getElementById("reload-server-scripts-button");
         var elUserData = document.getElementById("property-user-data");
         var elClearUserData = document.getElementById("userdata-clear");
         var elSaveUserData = document.getElementById("userdata-save");
@@ -1398,12 +1399,19 @@ function loaded() {
                 percentage: parseInt(elRescaleDimensionsPct.value),
             }));
         });
-        elReloadScriptButton.addEventListener("click", function() {
+        elReloadScriptsButton.addEventListener("click", function() {
             EventBridge.emitWebEvent(JSON.stringify({
                 type: "action",
-                action: "reloadScript"
+                action: "reloadClientScripts"
             }));
         });
+        elReloadServerScriptsButton.addEventListener("click", function() {
+            EventBridge.emitWebEvent(JSON.stringify({
+                type: "action",
+                action: "reloadServerScripts"
+            }));
+        });
+
 
         window.onblur = function() {
             // Fake a change event