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

Remove user dialog avatar sorting

Browse Source
This commit is contained in:
Natsumi
2022-05-12 05:33:19 +12:00
parent ff31815dd5
commit 3e04c00eae
2 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
html/src/app.js
View File

@@ -10251,6 +10251,9 @@ speechSynthesis.getVoices();
if (!this.searchAvatarFilterRemote) { if (!this.searchAvatarFilterRemote) {
this.searchAvatarFilterRemote = 'all'; this.searchAvatarFilterRemote = 'all';
} }
if (this.searchAvatarFilterRemote !== 'local') {
this.searchAvatarSort = 'name';
}
var avatars = new Map(); var avatars = new Map();
var query = this.searchText.toUpperCase(); var query = this.searchText.toUpperCase();
if (!query) { if (!query) {
@@ -13462,6 +13465,8 @@ speechSynthesis.getVoices();
} }
}); });
} }
this.userDialog.avatarSorting = 'name';
this.userDialog.avatarReleaseStatus = 'all';
} }
this.sortUserDialogAvatars(this.userDialog.avatars); this.sortUserDialogAvatars(this.userDialog.avatars);
}; };

71
html/src/index.pug
View File

@@ -448,11 +448,7 @@ html
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-tooltip(placement="bottom" content="Refresh own avatars" :disabled="hideTooltips") el-tooltip(placement="bottom" content="Refresh own avatars" :disabled="hideTooltips")
el-button(type="default" :loading="userDialog.isAvatarsLoading" @click="refreshUserDialogAvatars()" size="mini" icon="el-icon-refresh" circle) el-button(type="default" :loading="userDialog.isAvatarsLoading" @click="refreshUserDialogAvatars()" size="mini" icon="el-icon-refresh" circle)
span(style="font-size:14px;margin-left:5px") Results {{ searchAvatarResults.length }} span(style="font-size:14px;margin-left:5px;margin-right:5px") Results {{ searchAvatarResults.length }}
el-radio-group(v-model="searchAvatarSort" size="mini" style="margin:5px;display:block" @change="searchAvatar")
el-radio(label="name") by name
el-radio(label="update") by update
el-radio(label="created") by created
el-radio-group(v-model="searchAvatarFilter" size="mini" style="margin:5px;display:block" @change="searchAvatar") el-radio-group(v-model="searchAvatarFilter" size="mini" style="margin:5px;display:block" @change="searchAvatar")
el-radio(label="all") all el-radio(label="all") all
el-radio(label="public") public el-radio(label="public") public
@@ -461,6 +457,10 @@ html
el-radio(label="all") all el-radio(label="all") all
el-radio(label="local") local el-radio(label="local") local
el-radio(label="remote" :disabled="!avatarRemoteDatabase") remote el-radio(label="remote" :disabled="!avatarRemoteDatabase") remote
el-radio-group(:disabled="searchAvatarFilterRemote !== 'local'" v-model="searchAvatarSort" size="mini" style="margin:5px;display:block" @change="searchAvatar")
el-radio(label="name") by name
el-radio(label="update") by update
el-radio(label="created") by created
.x-friend-list(style="margin-top:20px") .x-friend-list(style="margin-top:20px")
.x-friend-item(v-for="avatar in searchAvatarPage" :key="avatar.id" @click="showAvatarDialog(avatar.id)") .x-friend-item(v-for="avatar in searchAvatarPage" :key="avatar.id" @click="showAvatarDialog(avatar.id)")
template(v-once) template(v-once)
@@ -1459,35 +1459,36 @@ html
el-dropdown-item(icon="el-icon-delete" command="Unfriend" divided) Unfriend el-dropdown-item(icon="el-icon-delete" command="Unfriend" divided) Unfriend
el-tabs(ref="userDialogTabs" @tab-click="userDialogTabClick") el-tabs(ref="userDialogTabs" @tab-click="userDialogTabClick")
el-tab-pane(label="Info") el-tab-pane(label="Info")
div(v-if="userDialog.ref.location" style="display:flex;flex-direction:column;margin-bottom:10px;padding-bottom:10px;border-bottom:1px solid #eee") template(v-if="!userDialog.isFriend || (userDialog.friend.state === 'online' || (userDialog.state !== 'online' && userDialog.ref.location !== 'private'))")
div(style="flex:none") div(v-if="userDialog.ref.location" style="display:flex;flex-direction:column;margin-bottom:10px;padding-bottom:10px;border-bottom:1px solid #eee")
location(:location="userDialog.ref.location") div(style="flex:none")
template(v-if="userDialog.ref.location && userDialog.ref.location !== 'private' && userDialog.ref.location !== 'offline'") location(:location="userDialog.ref.location")
el-tooltip(placement="top" content="Launch/Invite" :disabled="hideTooltips") template(v-if="userDialog.ref.location && userDialog.ref.location !== 'private' && userDialog.ref.location !== 'offline'")
launch(:location="userDialog.ref.location" style="margin-left:5px") el-tooltip(placement="top" content="Launch/Invite" :disabled="hideTooltips")
el-tooltip(placement="top" content="Invite yourself" :disabled="hideTooltips") launch(:location="userDialog.ref.location" style="margin-left:5px")
invite-yourself(:location="userDialog.ref.location" style="margin-left:5px") el-tooltip(placement="top" content="Invite yourself" :disabled="hideTooltips")
el-tooltip(placement="top" content="Copy to clipboard" :disabled="hideTooltips") invite-yourself(:location="userDialog.ref.location" style="margin-left:5px")
el-button(v-if="copyLocationCheck(userDialog.ref.location)" @click="copyLocation(userDialog.ref.location)" size="mini" icon="el-icon-s-order" style="margin-left:5px" circle) el-tooltip(placement="top" content="Copy to clipboard" :disabled="hideTooltips")
el-tooltip(placement="top" content="Refresh player count" :disabled="hideTooltips") el-button(v-if="copyLocationCheck(userDialog.ref.location)" @click="copyLocation(userDialog.ref.location)" size="mini" icon="el-icon-s-order" style="margin-left:5px" circle)
el-button(@click="refreshInstancePlayerCount(userDialog.ref.location)" size="mini" icon="el-icon-refresh" style="margin-left:5px" circle) el-tooltip(placement="top" content="Refresh player count" :disabled="hideTooltips")
span(v-if="userDialog.instance.occupants" style="margin-left:5px") {{ userDialog.instance.occupants }} #[template(v-if="userDialog.instance.friendCount > 0") ({{ userDialog.instance.friendCount }})] el-button(@click="refreshInstancePlayerCount(userDialog.ref.location)" size="mini" icon="el-icon-refresh" style="margin-left:5px" circle)
.x-friend-list(style="flex:1;margin-top:10px;max-height:150px") span(v-if="userDialog.instance.occupants" style="margin-left:5px") {{ userDialog.instance.occupants }} #[template(v-if="userDialog.instance.friendCount > 0") ({{ userDialog.instance.friendCount }})]
.x-friend-item(v-if="userDialog.$location.userId" @click="showUserDialog(userDialog.$location.userId)" class="x-friend-item-border") .x-friend-list(style="flex:1;margin-top:10px;max-height:150px")
template(v-if="userDialog.$location.user") .x-friend-item(v-if="userDialog.$location.userId" @click="showUserDialog(userDialog.$location.userId)" class="x-friend-item-border")
.avatar(:class="userStatusClass(userDialog.$location.user)") template(v-if="userDialog.$location.user")
img(v-lazy="userImage(userDialog.$location.user)") .avatar(:class="userStatusClass(userDialog.$location.user)")
img(v-lazy="userImage(userDialog.$location.user)")
.detail
span.name(v-text="userDialog.$location.user.displayName" :class="userDialog.$location.user.$trustColor")
span.extra Instance Creator
span(v-else v-text="userDialog.$location.userId")
.x-friend-item(v-for="user in userDialog.users" :key="user.id" @click="showUserDialog(user.id)" class="x-friend-item-border")
.avatar(:class="userStatusClass(user)")
img(v-lazy="userImage(user)")
.detail .detail
span.name(v-text="userDialog.$location.user.displayName" :class="userDialog.$location.user.$trustColor") span.name(v-text="user.displayName" :class="user.$trustColor")
span.extra Instance Creator span.extra
span(v-else v-text="userDialog.$location.userId") timer(:epoch="user.$location_at")
.x-friend-item(v-for="user in userDialog.users" :key="user.id" @click="showUserDialog(user.id)" class="x-friend-item-border")
.avatar(:class="userStatusClass(user)")
img(v-lazy="userImage(user)")
.detail
span.name(v-text="user.displayName" :class="user.$trustColor")
span.extra
timer(:epoch="user.$location_at")
.x-friend-list(style="max-height:none") .x-friend-list(style="max-height:none")
.x-friend-item(style="width:100%;cursor:default") .x-friend-item(style="width:100%;cursor:default")
.detail .detail
@@ -1592,10 +1593,10 @@ html
template(v-if="userDialog.ref.id === API.currentUser.id") template(v-if="userDialog.ref.id === API.currentUser.id")
el-button(type="default" :loading="userDialog.isAvatarsLoading" @click="refreshUserDialogAvatars()" size="mini" icon="el-icon-refresh" circle) el-button(type="default" :loading="userDialog.isAvatarsLoading" @click="refreshUserDialogAvatars()" size="mini" icon="el-icon-refresh" circle)
span(style="margin-left:5px") Total {{ userDialogAvatars.length }} span(style="margin-left:5px") Total {{ userDialogAvatars.length }}
el-radio-group(v-model="userDialog.avatarSorting" size="mini" style="margin-left:30px" @change="changeUserDialogAvatarSorting") el-radio-group(v-if="userDialog.ref.id === API.currentUser.id" v-model="userDialog.avatarSorting" size="mini" style="margin-left:30px;margin-right:30px" @change="changeUserDialogAvatarSorting")
el-radio(label="name") by name el-radio(label="name") by name
el-radio(label="update") by update el-radio(label="update") by update
el-radio-group(v-model="userDialog.avatarReleaseStatus" size="mini" style="margin-left:60px") el-radio-group(v-if="userDialog.ref.id === API.currentUser.id" v-model="userDialog.avatarReleaseStatus" size="mini" style="margin-left:30px")
el-radio(label="all") all el-radio(label="all") all
el-radio(label="public") public el-radio(label="public") public
el-radio(label="private") private el-radio(label="private") private