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

chagne menu item order, cleanup code

Browse Source
This commit is contained in:
pypy
2020-01-12 21:50:12 +09:00
parent 75b9849a65
commit 12e8f7f45f
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/app.js
+26 -20
View File
@@ -1803,6 +1803,20 @@ CefSharp.BindObjectAsync(
return '';
};
API.parseInviteLocation = function (ref) {
try {
var L = API.parseLocation(ref.details.worldId);
if (L.worldId !== '' && L.instanceId !== '') {
return `${ref.details.worldName} #${L.instanceName} ${L.accessType}`;
}
return ref.message ||
ref.details.worldId ||
ref.details.worldName;
} catch (err) {
return '';
}
};
// API: PlayerModeration
API.cachedPlayerModerations = new Map();
@@ -4834,20 +4848,21 @@ CefSharp.BindObjectAsync(
});
API.$on('PLAYER-MODERATION', function (args) {
var { ref } = args;
var insertOrUpdate = $app.playerModerationTable.data.some((val, idx, arr) => {
if (val.id === args.ref.id) {
if (args.ref.$isExpired) {
if (val.id === ref.id) {
if (ref.$isExpired) {
Vue.delete(arr, idx);
} else {
Vue.set(arr, idx, args.ref);
Vue.set(arr, idx, ref);
}
return true;
}
return false;
});
if (!insertOrUpdate &&
!args.ref.$isExpired) {
$app.playerModerationTable.data.push(args.ref);
!ref.$isExpired) {
$app.playerModerationTable.data.push(ref);
$app.notifyMenu('moderation');
}
});
@@ -4920,20 +4935,21 @@ CefSharp.BindObjectAsync(
});
API.$on('NOTIFICATION', function (args) {
var { ref } = args;
var insertOrUpdate = $app.notificationTable.data.some((val, idx, arr) => {
if (val.id === args.ref.id) {
if (args.ref.$isExpired) {
if (val.id === ref.id) {
if (ref.$isExpired) {
Vue.delete(arr, idx);
} else {
Vue.set(arr, idx, args.ref);
Vue.set(arr, idx, ref);
}
return true;
}
return false;
});
if (!insertOrUpdate &&
!args.ref.$isExpired) {
$app.notificationTable.data.push(args.ref);
!ref.$isExpired) {
$app.notificationTable.data.push(ref);
$app.notifyMenu('notification');
}
});
@@ -4948,16 +4964,6 @@ CefSharp.BindObjectAsync(
});
});
$app.methods.parseInviteLocation = function (row) {
try {
var L = API.parseLocation(row.details.worldId);
return `${row.details.worldName} #${L.instanceName} ${L.accessType}`;
} catch (err) {
console.error(err);
return '';
}
};
$app.methods.acceptNotification = function (row) {
// FIXME: 메시지 수정
this.$confirm('Continue? Accept Friend Request', 'Confirm', {