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

Small changes

Browse Source
This commit is contained in:
Natsumi
2021-09-08 07:13:35 +12:00
parent 1a00688f2c
commit ffa2bd88f4
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
html/src/app.js
View File

@@ -3665,14 +3665,12 @@ speechSynthesis.getVoices();
this.$emit('PIPELINE', { this.$emit('PIPELINE', {
json json
}); });
if ( if ($app.debugWebSocket && json.content) {
$app.debugWebSocket &&
json.content &&
this.cachedUsers.has(json.content.userId)
) {
var displayName = ''; var displayName = '';
var user = this.cachedUsers.get(json.content.userId); var user = this.cachedUsers.get(json.content.userId);
displayName = user.displayName; if (user) {
displayName = user.displayName;
}
console.log( console.log(
'WebSocket', 'WebSocket',
json.type, json.type,
@@ -7349,7 +7347,7 @@ speechSynthesis.getVoices();
params.featured = 'false'; params.featured = 'false';
break; break;
default: default:
params.sort = 'popularity'; params.sort = 'relevance';
params.search = this.searchText; params.search = this.searchText;
break; break;
} }
@@ -8926,7 +8924,7 @@ speechSynthesis.getVoices();
this.currentUserTreeData = buildTreeData(API.currentUser); this.currentUserTreeData = buildTreeData(API.currentUser);
}; };
$app.methods.promptUserDialog = function () { $app.methods.promptUserIdDialog = function () {
this.$prompt('Enter a User URL or ID (UUID)', 'Direct Access', { this.$prompt('Enter a User URL or ID (UUID)', 'Direct Access', {
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: 'OK', confirmButtonText: 'OK',
@@ -8954,6 +8952,21 @@ speechSynthesis.getVoices();
}); });
}; };
$app.methods.promptUsernameDialog = function () {
this.$prompt('Enter a Username', 'Direct Access', {
distinguishCancelAndClose: true,
confirmButtonText: 'OK',
cancelButtonText: 'Cancel',
inputPattern: /\S+/,
inputErrorMessage: 'Username is required',
callback: (action, instance) => {
if (action === 'confirm' && instance.inputValue) {
this.lookupUser({displayName: instance.inputValue});
}
}
});
};
$app.methods.promptWorldDialog = function () { $app.methods.promptWorldDialog = function () {
this.$prompt('Enter a World URL or ID (UUID)', 'Direct Access', { this.$prompt('Enter a World URL or ID (UUID)', 'Direct Access', {
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
@@ -8985,7 +8998,7 @@ speechSynthesis.getVoices();
}; };
$app.methods.promptAvatarDialog = function () { $app.methods.promptAvatarDialog = function () {
this.$prompt('Enter a Avatar ID (UUID)', 'Direct Access', { this.$prompt('Enter a Avatar URL or ID (UUID)', 'Direct Access', {
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: 'OK', confirmButtonText: 'OK',
cancelButtonText: 'Cancel', cancelButtonText: 'Cancel',

18
html/src/index.pug
View File

@@ -246,13 +246,13 @@ html
el-button-group(style="margin-top:15px") el-button-group(style="margin-top:15px")
el-button(v-if="searchWorldParams.offset" @click="moreSearchWorld(-1)" icon="el-icon-back" size="small") Prev el-button(v-if="searchWorldParams.offset" @click="moreSearchWorld(-1)" icon="el-icon-back" size="small") Prev
el-button(v-if="searchWorldResults.length" @click="moreSearchWorld(1)" icon="el-icon-right" size="small") Next el-button(v-if="searchWorldResults.length" @click="moreSearchWorld(1)" icon="el-icon-right" size="small") Next
el-tab-pane(label="Avatar" v-loading="isSearchAvatarLoading" style="min-height:60px") //- el-tab-pane(label="Avatar" v-loading="isSearchAvatarLoading" style="min-height:60px")
el-dropdown(@command="(command) => searchAvatar(command)" size="small" trigger="click" style="margin-bottom:15px") //- el-dropdown(@command="(command) => searchAvatar(command)" size="small" trigger="click" style="margin-bottom:15px")
el-button(size="small") Search by Category #[i.el-icon-arrow-down.el-icon--right] //- el-button(size="small") Search by Category #[i.el-icon-arrow-down.el-icon--right]
el-dropdown-menu(#default="dropdown") //- el-dropdown-menu(#default="dropdown")
el-dropdown-item(command="updated") Updated Recently //- el-dropdown-item(command="updated") Updated Recently
el-dropdown-item(command="created") New //- el-dropdown-item(command="created") New
el-dropdown-item(command="mine") Mine //- el-dropdown-item(command="mine") Mine
span(style="margin-left:10px;font-size:12px;color:#909399") Avatar search is not possible. span(style="margin-left:10px;font-size:12px;color:#909399") Avatar search is not possible.
.x-friend-list .x-friend-list
.x-friend-item(v-for="avatar in searchAvatarResults" :key="avatar.id" @click="showAvatarDialog(avatar.id)") .x-friend-item(v-for="avatar in searchAvatarResults" :key="avatar.id" @click="showAvatarDialog(avatar.id)")
@@ -511,7 +511,9 @@ html
span.header Direct Access span.header Direct Access
div(style="margin-top:10px") div(style="margin-top:10px")
el-button-group el-button-group
el-button(size="small" @click="promptUserDialog()") User
el-button(size="small" @click="promptUsernameDialog()") Username
el-button(size="small" @click="promptUserIdDialog()") User ID
el-button(size="small" @click="promptWorldDialog()") World/Instance el-button(size="small" @click="promptWorldDialog()") World/Instance
el-button(size="small" @click="promptAvatarDialog()") Avatar el-button(size="small" @click="promptAvatarDialog()") Avatar
div.options-container div.options-container