From 19c51b25d1d28878fbe692322774e62905d2fea9 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Tue, 19 Mar 2019 22:38:16 +0100
Subject: [PATCH] don't ignore updates that originate from entityPropertiesTool
 itself

---
 scripts/system/edit.js                          | 7 ++++---
 scripts/system/html/js/entityProperties.js      | 2 +-
 scripts/system/libraries/entitySelectionTool.js | 9 ++++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 2c3785217c..ca2918a108 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -2286,14 +2286,15 @@ var PropertiesTool = function (opts) {
         })
     };
 
-    function updateSelections(selectionUpdated) {
+    function updateSelections(selectionUpdated, caller) {
         if (blockPropertyUpdates) {
             return;
         }
 
         var data = {
             type: 'update',
-            spaceMode: selectionDisplay.getSpaceMode()
+            spaceMode: selectionDisplay.getSpaceMode(),
+            isPropertiesToolUpdate: caller === this,
         };
 
         if (selectionUpdated) {
@@ -2339,7 +2340,7 @@ var PropertiesTool = function (opts) {
 
         emitScriptEvent(data);
     }
-    selectionManager.addEventListener(updateSelections);
+    selectionManager.addEventListener(updateSelections, this);
 
 
     var onWebEventReceived = function(data) {
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index f501df7933..f259b0a017 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -3326,7 +3326,7 @@ function loaded() {
 
                         let hasSelectedEntityChanged = lastEntityID !== '"' + selectedEntityProperties.id + '"';
 
-                        if (!hasSelectedEntityChanged && document.hasFocus()) {
+                        if (!data.isPropertiesToolUpdate && !hasSelectedEntityChanged && document.hasFocus()) {
                             // in case the selection has not changed and we still have focus on the properties page,
                             // we will ignore the event.
                             return;
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 269283ea6d..064dafec06 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -128,8 +128,11 @@ SelectionManager = (function() {
         }
     };
 
-    that.addEventListener = function(func) {
-        listeners.push(func);
+    that.addEventListener = function(func, thisContext) {
+        listeners.push({
+            callback: func,
+            thisContext: thisContext
+        });
     };
 
     that.hasSelection = function() {
@@ -572,7 +575,7 @@ SelectionManager = (function() {
 
         for (var j = 0; j < listeners.length; j++) {
             try {
-                listeners[j](selectionUpdated === true, caller);
+                listeners[j].callback.call(listeners[j].thisContext, selectionUpdated === true, caller);
             } catch (e) {
                 print("ERROR: entitySelectionTool.update got exception: " + JSON.stringify(e));
             }