Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
kafeijao committed Aug 16, 2023
2 parents 1e3f24b + f820a31 commit 97afb8a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions client/astrolib/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion client/frontend.js
Original file line number Diff line number Diff line change
Expand Up @@ -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),
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down

0 comments on commit 97afb8a

Please sign in to comment.