From 01dab2cb6fbd5ff1ab9ea934f1aed29e2f442e0b Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Wed, 22 Nov 2017 13:05:27 -0800
Subject: [PATCH] suggest name from ret jwt first (if it exists), but allow
user to change it
---
src/index.js | 18 +++++++-----------
src/utils.js | 6 ++++--
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/index.js b/src/index.js
index 2a1aa283c..bf03ae369 100644
--- a/src/index.js
+++ b/src/index.js
@@ -77,17 +77,13 @@ window.App = {
}
let username;
- // const jwt = getCookie("jwt");
- // if (jwt) {
- // const data = parseJwt(jwt);
- // username = data.typ.name;
- // alert("Your username is: " + username);
- // } else {
- username = qs.name;
- if (!username) {
- username = promptForName(username); // promptForName is blocking
- }
- // }
+ const jwt = getCookie("jwt");
+ if (jwt) {
+ const data = parseJwt(jwt);
+ username = data.typ.name;
+ }
+
+ username = promptForName(username); // promptForName is blocking
const myNametag = document.querySelector("#player-rig .nametag");
myNametag.setAttribute("text", "value", username);
diff --git a/src/utils.js b/src/utils.js
index 1363efe6c..b37764120 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -166,8 +166,10 @@ export function generateName() {
return name.replace(/^./, name[0].toUpperCase());
}
-export function promptForName() {
- var username = generateName();
+export function promptForName(username) {
+ if (!username)
+ username = generateName();
+
do {
username = prompt("Choose a username", username);
} while (!(username && username.length));
--
GitLab