From 1636175e4ac389ef97b15ff78d14128fc95dc4f1 Mon Sep 17 00:00:00 2001
From: Kasen IO <kasenvr@gmail.com>
Date: Tue, 25 Feb 2020 01:40:17 -0500
Subject: [PATCH 1/3] Makes simplified namtag a default script, disabled while
 using inspect.js (alt key)

---
 scripts/defaultScripts.js                     |  3 +-
 .../ui/simplifiedNametag/simplifiedNametag.js | 29 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 795458f05d..8bd2cbf841 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -39,7 +39,8 @@ var DEFAULT_SCRIPTS_COMBINED = [
 var DEFAULT_SCRIPTS_SEPARATE = [
     "system/controllers/controllerScripts.js",
     "communityModules/notificationCore/notificationCore.js",
-    "communityModules/chat/FloofChat.js"
+    "communityModules/chat/FloofChat.js",
+    "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js"
     //"system/chat.js"
 ];
 
diff --git a/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js b/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
index 15ce8a83f6..d05838fe4e 100644
--- a/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
+++ b/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
@@ -8,10 +8,11 @@
 //
 //    Click on someone to get a nametag for them
 //    
-var PickRayController = Script.require('./resources/modules/pickRayController.js');
+var PickRayController = Script.require('./resources/modules/pickRayController.js?' + Date.now());
 var NameTagListManager = Script.require('./resources/modules/nameTagListManager.js');
 var pickRayController = new PickRayController();
 var nameTagListManager = new NameTagListManager();
+var altKeyPressed = false;
 
 // Handles avatar being solo'd
 pickRayController
@@ -24,7 +25,9 @@ pickRayController
 
 
 function selectAvatar(uuid, intersection) {
-    nameTagListManager.handleSelect(uuid, intersection);
+    if (!altKeyPressed) {
+        nameTagListManager.handleSelect(uuid, intersection);
+    }
 }
 
 
@@ -46,6 +49,18 @@ function onAvatarAdded(uuid) {
     nameTagListManager.maybeAdd(uuid);
 }
 
+function blockedKeysPressed(event) {
+    if (event.isAlt) {
+        altKeyPressed = true;
+    }
+}
+
+function blockedKeysReleased(event) {
+    if (!event.isAlt) {
+        altKeyPressed = false;
+    }
+}
+
 
 // Create a new nametag list manager, connect signals, and return back a new Nametag object.
 var avatarNametagMode;
@@ -57,6 +72,8 @@ function startup() {
     Window.domainChanged.connect(onDomainChange);
     AvatarManager.avatarRemovedEvent.connect(onAvatarRemoved);
     AvatarManager.avatarAddedEvent.connect(onAvatarAdded);
+    Controller.keyPressEvent.connect(blockedKeysPressed);
+    Controller.keyReleaseEvent.connect(blockedKeysReleased);
 
     function NameTag() {}
     
@@ -67,7 +84,6 @@ function startup() {
     return new NameTag();
 }
 
-
 // Called when the script is closing
 function unload() {
     nameTagListManager.destroy();
@@ -75,6 +91,8 @@ function unload() {
     Window.domainChanged.disconnect(onDomainChange);
     AvatarManager.avatarRemovedEvent.disconnect(onAvatarRemoved);
     AvatarManager.avatarAddedEvent.disconnect(onAvatarAdded);
+    Controller.keyPressEvent.disconnect(blockedsKeyPressed);
+    Controller.keyReleaseEvent.disconnect(blockedKeysReleased);
 }
 
 
@@ -88,5 +106,6 @@ function handleAvatarNametagMode(newAvatarNameTagMode) {
 
 var nameTag = startup();
 
-module.exports = nameTag;
-
+// if (module) {
+//     module.exports = nameTag;
+// }

From 5dbd294166e8113a42e9891e1b44ab56e59f6f10 Mon Sep 17 00:00:00 2001
From: Kasen IO <kasenvr@gmail.com>
Date: Tue, 25 Feb 2020 02:11:12 -0500
Subject: [PATCH 2/3] Remove leftover cachebust on pickRayController.js

---
 scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js b/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
index d05838fe4e..300e552b63 100644
--- a/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
+++ b/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
@@ -8,7 +8,7 @@
 //
 //    Click on someone to get a nametag for them
 //    
-var PickRayController = Script.require('./resources/modules/pickRayController.js?' + Date.now());
+var PickRayController = Script.require('./resources/modules/pickRayController.js');
 var NameTagListManager = Script.require('./resources/modules/nameTagListManager.js');
 var pickRayController = new PickRayController();
 var nameTagListManager = new NameTagListManager();

From 6b4080b0422a5da87f1771492a3a50f69a1b1e8d Mon Sep 17 00:00:00 2001
From: Kasen IO <kasenvr@gmail.com>
Date: Tue, 25 Feb 2020 18:08:07 -0500
Subject: [PATCH 3/3] Fix module check.

---
 .../ui/simplifiedNametag/simplifiedNametag.js             | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js b/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
index 300e552b63..38f3705e16 100644
--- a/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
+++ b/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
@@ -106,6 +106,8 @@ function handleAvatarNametagMode(newAvatarNameTagMode) {
 
 var nameTag = startup();
 
-// if (module) {
-//     module.exports = nameTag;
-// }
+try {
+    module.exports = nameTag;
+} catch (e) {
+    // module doesn't exist when script run outside of simplified UI.
+}