From d0a25e7783d8ec5773a52a1a30a4cafbb3ead887 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 22 Aug 2016 23:51:35 -0700
Subject: [PATCH] fix switching entities

---
 scripts/system/html/entityProperties.html  | 3 ++-
 scripts/system/html/js/entityProperties.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index f5e7ffea63..c39fa00cec 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -67,9 +67,10 @@
             <label for="property-user-data">User data</label>
             <br>
             <div class="row">
+                <input type="button" class="red" id="userdata-clear" value="Clear User Data">
              <input type="button" class="blue" id="userdata-new-editor" value="Edit as JSON">
-             <input type="button" class="red" id="userdata-clear" value="Clear User Data">
              <input type="button" class="black" id="userdata-save" value="Save User Data">
+
             </div>
              <div id="static-userdata"></div>
              <div id="userdata-editor"></div>
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 7721d06982..825ae0e72d 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -766,6 +766,7 @@ function loaded() {
 
                             elUserData.value = properties.userData;
                             showUserDataTextArea();
+                            showNewJSONEditorButton();
                             hideSaveUserDataButton();
                         }