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

Fix bulk unfriend fix causing UI to crash

Browse Source
This commit is contained in:
Natsumi
2024-06-28 08:32:00 +12:00
parent 98f009cbd9
commit 6ee6c83291
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
html/src/app.js
View File

@@ -22427,10 +22427,13 @@ speechSynthesis.getVoices();
$app.data.friendsListSearchFilters = []; $app.data.friendsListSearchFilters = [];
$app.data.friendsListSelectAllCheckbox = false; $app.data.friendsListSelectAllCheckbox = false;
$app.data.friendsListBulkUnfriendMode = false; $app.data.friendsListBulkUnfriendMode = false;
$app.data.friendsListBulkUnfriendForceUpdate = 0;
$app.watch.friendsListBulkUnfriendMode = (newV) => { $app.methods.toggleFriendsListBulkUnfriendMode = function () {
if (!newV) { if (!this.friendsListBulkUnfriendMode) {
$app.friendsListTable.data.forEach((i) => delete i.$selected); this.friendsListTable.data.forEach((ref) => {
ref.$selected = false;
});
} }
}; };
@@ -22520,8 +22523,8 @@ speechSynthesis.getVoices();
if (typeof ctx.ref === 'undefined') { if (typeof ctx.ref === 'undefined') {
continue; continue;
} }
if (typeof ctx.$selected === 'undefined') { if (typeof ctx.ref.$selected === 'undefined') {
ctx.$selected = false; ctx.ref.$selected = false;
} }
if (this.friendsListSearchFilterVIP && !ctx.isVIP) { if (this.friendsListSearchFilterVIP && !ctx.isVIP) {
continue; continue;

6
html/src/mixins/tabs/friendsList.pug
View File

@@ -8,7 +8,7 @@ mixin friendsListTab()
//- el-button(size="small" @click="showBulkUnfriendAllConfirm" style="margin-right:5px") Bulk Unfriend All //- el-button(size="small" @click="showBulkUnfriendAllConfirm" style="margin-right:5px") Bulk Unfriend All
div(style="display:inline-block;margin-right:10px") div(style="display:inline-block;margin-right:10px")
span.name {{ $t('view.friend_list.bulk_unfriend') }} span.name {{ $t('view.friend_list.bulk_unfriend') }}
el-switch(v-model="friendsListBulkUnfriendMode" style="margin-left:5px") el-switch(@change="toggleFriendsListBulkUnfriendMode" v-model="friendsListBulkUnfriendMode" style="margin-left:5px")
span {{ $t('view.friend_list.load') }} span {{ $t('view.friend_list.load') }}
template(v-if="friendsListLoading") template(v-if="friendsListLoading")
span(v-text="friendsListLoadingProgress" style="margin-left:5px") span(v-text="friendsListLoadingProgress" style="margin-left:5px")
@@ -29,10 +29,10 @@ mixin friendsListTab()
el-tooltip(placement="top" :content="$t('view.friend_list.clear_tooltip')" :disabled="hideTooltips") el-tooltip(placement="top" :content="$t('view.friend_list.clear_tooltip')" :disabled="hideTooltips")
el-button(type="default" @click="friendsListTable.data = []" icon="el-icon-delete" circle style="flex:none;margin-left:5px") el-button(type="default" @click="friendsListTable.data = []" icon="el-icon-delete" circle style="flex:none;margin-left:5px")
data-tables(v-bind="friendsListTable" @row-click="selectFriendsListRow" style="margin-top:10px;cursor:pointer") data-tables(v-bind="friendsListTable" @row-click="selectFriendsListRow" style="margin-top:10px;cursor:pointer")
el-table-column(v-if="friendsListBulkUnfriendMode" width="55" prop="$selected") el-table-column(width="55" prop="$selected" v-if="friendsListBulkUnfriendMode" :key="friendsListBulkUnfriendForceUpdate")
template(v-once #default="scope") template(v-once #default="scope")
el-button(type="text" size="mini" @click.stop) el-button(type="text" size="mini" @click.stop)
el-checkbox(@change="$app.$set(scope.row, '$selected', $event)" :value="'$selected' in scope.row?scope.row.$selected:false") el-checkbox(v-model="scope.row.$selected" @change="friendsListBulkUnfriendForceUpdate++")
el-table-column(:label="$t('table.friendList.no')" width="70" prop="$friendNum" sortable="custom") el-table-column(:label="$t('table.friendList.no')" width="70" prop="$friendNum" sortable="custom")
el-table-column(:label="$t('table.friendList.avatar')" width="70" prop="photo") el-table-column(:label="$t('table.friendList.avatar')" width="70" prop="photo")
template(v-once #default="scope") template(v-once #default="scope")