MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-17 13:53:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

use location hint

Browse Source
This commit is contained in:
pypy
2021-02-03 12:53:39 +09:00
parent 3ded098322
commit e0f819c54f
5 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
html/src/app.js
View File

@@ -750,6 +750,10 @@ speechSynthesis.getVoices();
template: '<span @click="showWorldDialog" :class="{ \'x-link\': link && this.location !== \'private\' && this.location !== \'offline\'}">{{ text }}<slot></slot></span>',
props: {
location: String,
hint: {
type: String,
default: ''
},
link: {
type: Boolean,
default: true
@@ -767,6 +771,12 @@ speechSynthesis.getVoices();
this.text = 'Offline';
} else if (L.isPrivate) {
this.text = 'Private';
} else if (typeof this.hint === 'string' && this.hint !== '') {
if (L.instanceId) {
this.text = `${this.hint} #${L.instanceName} ${L.accessType}`;
} else {
this.text = this.hint;
}
} else if (L.worldId) {
var ref = API.cachedWorlds.get(L.worldId);
if (typeof ref === 'undefined') {
@@ -4719,7 +4729,7 @@ speechSynthesis.getVoices();
tableData = {
created_at: gameLog.dt,
type: 'Location',
data: gameLog.location
data: [gameLog.location, gameLog.worldName]
};
break;

2
html/src/index.pug
View File

@@ -183,7 +183,7 @@ html
el-table-column(label="Type" prop="type" width="120")
el-table-column(label="Detail" prop="data")
template(v-once #default="scope")
location(v-if="scope.row.type === 'Location'" :location="scope.row.data")
location(v-if="scope.row.type === 'Location'" :location="scope.row.data[0]" :hint="scope.row.data[1]")
span.x-link(v-else-if="scope.row.type !== 'Notification'" v-text="scope.row.data" @click="lookupUser(scope.row.data)")
//- search

5
html/src/service/gamelog.js
View File

@@ -12,10 +12,7 @@ function parseRawGameLog(dt, type, args) {
switch (type) {
case 'location':
gameLog.location = args[0];
break;
case 'world':
gameLog.worldName = args[0];
gameLog.worldName = args[1];
break;
case 'player-joined':

12
html/src/vr.js
View File

@@ -446,7 +446,11 @@ speechSynthesis.getVoices();
Vue.component('location', {
template: '<span>{{ text }}<slot></slot></span>',
props: {
location: String
location: String,
hint: {
type: String,
default: ''
}
},
data() {
return {
@@ -460,6 +464,12 @@ speechSynthesis.getVoices();
this.text = 'Offline';
} else if (L.isPrivate) {
this.text = 'Private';
} else if (typeof this.hint === 'string' && this.hint !== '') {
if (L.instanceId) {
this.text = `${this.hint} #${L.instanceName} ${L.accessType}`;
} else {
this.text = this.hint;
}
} else if (L.worldId) {
var ref = API.cachedWorlds.get(L.worldId);
if (typeof ref === 'undefined') {

4
html/src/vr.pug
View File

@@ -57,7 +57,7 @@ html
.detail
span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }}
location(:location="feed.data")
location(:location="feed.data[0]" :hint="feed.data[1]")
div(v-else-if="feed.type === 'invite'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail
span.extra
@@ -159,7 +159,7 @@ html
.detail
span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }}
location(:location="feed.data")
location(:location="feed.data[0]" :hint="feed.data[1]")
div(v-else-if="feed.type === 'invite'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail
span.extra