From d88615219c6444af2214f89542bfd4ba9752ea3a Mon Sep 17 00:00:00 2001 From: David Back Date: Tue, 7 Aug 2018 10:19:48 -0700 Subject: [PATCH] CR changes --- scripts/system/edit.js | 5 +++-- scripts/system/html/js/entityProperties.js | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 3efa043e5b..fe790480f6 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -2040,8 +2040,9 @@ var PropertiesTool = function (opts) { that.setVisible(false); function emitScriptEvent(data) { - webView.emitScriptEvent(JSON.stringify(data)); - createToolsWindow.emitScriptEvent(JSON.stringify(data)); + var dataString = JSON.stringify(data); + webView.emitScriptEvent(dataString); + createToolsWindow.emitScriptEvent(dataString); } function updateScriptStatus(info) { diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js index a21e991596..ac0bf6ff1e 100644 --- a/scripts/system/html/js/entityProperties.js +++ b/scripts/system/html/js/entityProperties.js @@ -36,7 +36,7 @@ var lastEntityID = null; var MATERIAL_PREFIX_STRING = "mat::"; -var INVALIDATE_SCRIPT_STATUS = "[ Fetching status ]"; +var PENDING_SCRIPT_STATUS = "[ Fetching status ]"; function debugPrint(message) { EventBridge.emitWebEvent( @@ -1673,7 +1673,7 @@ function loaded() { elServerScripts.addEventListener('change', createEmitTextPropertyUpdateFunction('serverScripts')); elServerScripts.addEventListener('change', function() { // invalidate the current status (so that same-same updates can still be observed visually) - elServerScriptStatus.innerText = INVALIDATE_SCRIPT_STATUS; + elServerScriptStatus.innerText = PENDING_SCRIPT_STATUS; }); elClearUserData.addEventListener("click", function() { @@ -2147,7 +2147,7 @@ function loaded() { }); elReloadServerScriptsButton.addEventListener("click", function() { // invalidate the current status (so that same-same updates can still be observed visually) - elServerScriptStatus.innerText = INVALIDATE_SCRIPT_STATUS; + elServerScriptStatus.innerText = PENDING_SCRIPT_STATUS; EventBridge.emitWebEvent(JSON.stringify({ type: "action", action: "reloadServerScripts"