Merge remote-tracking branch 'origin/main'

AstroDogeDX · Aug 16, 2023 · 97afb8a · 97afb8a
2 parents 1e3f24b + f820a31
commit 97afb8a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/client/astrolib/tooltip.js b/client/astrolib/tooltip.js
@@ -35,6 +35,10 @@ function applyTooltips() {
     }
 
     document.querySelectorAll('[data-tooltip]').forEach((e) => {
+        if (e.getAttribute('data-tooltip') === '') {
+            log('[astrolib/tooltip.js] Node has no tooltip data, skipping...');
+            return;
+        }
         if (e.hasAttribute(HAS_TOOLTIP)) {
             log('[astrolib/tooltip.js] Node already has tooltip applied, skipping...');
         } else {

diff --git a/client/frontend.js b/client/frontend.js
@@ -426,7 +426,7 @@ window.API.onFriendsRefresh((_event, friends, isRefresh) => {
                     `<img class="online-friend-node--image" src="${friendImgSrc}" data-hash="${friend.imageHash}"/>
                     <p class="online-friend-node--name">${friend.name}</p>
                     <p class="online-friend-node--status ${onlineFriendInPrivateClass}">${instanceTypeStr}</p>
-                    <p class="online-friend-node--world">${name}</p>`,
+                    <p class="online-friend-node--world" data-tooltip="${name}">${name}</p>`,
                 onClick: () => ShowDetails(DetailsType.User, friend.id),
             });
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cvrx",
   "productName": "CVRX",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "A friend/world/avatar/prop management app extension to ChilloutVR.",
   "main": "server/main.js",
   "scripts": {