Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR changes

Browse source
This commit is contained in:
David Back 2018-08-07 10:19:48 -07:00
parent deee73f14d
commit d88615219c
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/edit.js
View file

@ -2040,8 +2040,9 @@ var PropertiesTool = function (opts) {
that.setVisible(false); that.setVisible(false);
function emitScriptEvent(data) { function emitScriptEvent(data) {
webView.emitScriptEvent(JSON.stringify(data)); var dataString = JSON.stringify(data);
createToolsWindow.emitScriptEvent(JSON.stringify(data)); webView.emitScriptEvent(dataString);
createToolsWindow.emitScriptEvent(dataString);
} }
function updateScriptStatus(info) { function updateScriptStatus(info) {

6
scripts/system/html/js/entityProperties.js
View file

@ -36,7 +36,7 @@ var lastEntityID = null;
var MATERIAL_PREFIX_STRING = "mat::"; var MATERIAL_PREFIX_STRING = "mat::";
var INVALIDATE_SCRIPT_STATUS = "[ Fetching status ]"; var PENDING_SCRIPT_STATUS = "[ Fetching status ]";
function debugPrint(message) { function debugPrint(message) {
EventBridge.emitWebEvent( EventBridge.emitWebEvent(
@ -1673,7 +1673,7 @@ function loaded() {
elServerScripts.addEventListener('change', createEmitTextPropertyUpdateFunction('serverScripts')); elServerScripts.addEventListener('change', createEmitTextPropertyUpdateFunction('serverScripts'));
elServerScripts.addEventListener('change', function() { elServerScripts.addEventListener('change', function() {
// invalidate the current status (so that same-same updates can still be observed visually) // 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() { elClearUserData.addEventListener("click", function() {
@ -2147,7 +2147,7 @@ function loaded() {
}); });
elReloadServerScriptsButton.addEventListener("click", function() { elReloadServerScriptsButton.addEventListener("click", function() {
// invalidate the current status (so that same-same updates can still be observed visually) // 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({ EventBridge.emitWebEvent(JSON.stringify({
type: "action", type: "action",
action: "reloadServerScripts" action: "reloadServerScripts"