diff --git a/html/src/app.js b/html/src/app.js index 98308c00..9984b3a1 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -16,7 +16,7 @@ import ElementUI from 'element-ui'; import locale from 'element-ui/lib/locale/lang/en'; import { v4 as uuidv4 } from 'uuid'; -import {appVersion} from './constants.js'; +import { appVersion } from './constants.js'; import sharedRepository from './repository/shared.js'; import configRepository from './repository/config.js'; import webApiService from './service/webapi.js'; @@ -423,8 +423,8 @@ speechSynthesis.getVoices(); } if ((status === 404) && (endpoint.substring(0, 8) === 'avatars/')) { $app.$message({ - message: 'Avatar private or deleted', - type: 'error' + message: 'Avatar private or deleted', + type: 'error' }); throw new Error('404: Can\'t find avatarǃ'); } @@ -4982,13 +4982,13 @@ speechSynthesis.getVoices(); inputType: "password", inputPattern: /[\s\S]{1,32}/ }, - ).then(({value}) => { + ).then(({ value }) => { security.decrypt(args.password, value).then(pwd => { return resolve(pwd); }).catch(_ => { return reject(); }) - }).catch(_=>{ + }).catch(_ => { return reject(); }) }) @@ -5017,7 +5017,7 @@ speechSynthesis.getVoices(); inputType: "password", inputPattern: /[\s\S]{1,32}/ }, - ).then(({value}) => { + ).then(({ value }) => { for (let name in this.loginForm.savedCredentials) { security.decrypt(this.loginForm.savedCredentials[name].loginParmas.password, value).then(pt => { this.saveCredentials = { username: name, password: pt }; @@ -5041,7 +5041,7 @@ speechSynthesis.getVoices(); let key = this.enablePrimaryPasswordDialog.password; for (let name in this.loginForm.savedCredentials) { security.encrypt(this.loginForm.savedCredentials[name].loginParmas.password, key).then(ct => { - this.saveCredentials = { username: name, password: ct}; + this.saveCredentials = { username: name, password: ct }; this.updateStoredUser(this.loginForm.savedCredentials[name].user); }); } @@ -5730,10 +5730,10 @@ speechSynthesis.getVoices(); try { var L = API.parseLocation(location); if (L.worldId) { - var args = await API.getCachedWorld({ - worldId: L.worldId - }); - worldName = args.ref.name; + var args = await API.getCachedWorld({ + worldId: L.worldId + }); + worldName = args.ref.name; } } catch (err) { } @@ -8089,11 +8089,11 @@ speechSynthesis.getVoices(); this.notificationTTSVoice = index; configRepository.setString('VRCX_notificationTTSVoice', this.notificationTTSVoice); var voices = speechSynthesis.getVoices(); - if (voices.length === 0) { - return; - } + if (voices.length === 0) { + return; + } if (index > voices.length) { - index = 0; + index = 0; } var voiceName = voices[index].name; speechSynthesis.cancel(); @@ -9598,7 +9598,7 @@ speechSynthesis.getVoices(); D.ref = ref; D.visible = true; } - API.getAvatar({avatarId}).then((args) => { + API.getAvatar({ avatarId }).then((args) => { var { ref } = args; D.ref = ref; if ((ref.imageUrl === API.currentUser.currentAvatarImageUrl) && (!ref.assetUrl)) { @@ -11303,7 +11303,7 @@ speechSynthesis.getVoices(); $app.methods.friendsListSearchChange = function () { var filters = [...this.friendsListSearchFilters]; if (filters.length === 0) { - filters = [ 'Display Name', 'User Name', 'Rank', 'Status', 'Bio', 'Memo' ]; + filters = ['Display Name', 'User Name', 'Rank', 'Status', 'Bio', 'Memo']; } var results = []; if (this.friendsListSearch) { @@ -12255,7 +12255,7 @@ speechSynthesis.getVoices(); if (API.cachedAvatarNames.has(fileId)) { return API.cachedAvatarNames.get(fileId); } - var args = await API.getAvatarImages({fileId}); + var args = await API.getAvatarImages({ fileId }); return this.storeAvatarImage(args); }; @@ -12429,16 +12429,16 @@ speechSynthesis.getVoices(); switch (res) { case '1280x720': return '1280x720 (720p)'; - break; + break; case '1920x1080': return '1920x1080 (1080p)'; - break; + break; case '2560x1440': return '2560x1440 (2K)'; - break; + break; case '3840x2160': return '3840x2160 (4K)'; - break; + break; default: return `${res} (Custom)`; } @@ -12500,7 +12500,7 @@ speechSynthesis.getVoices(); var date = new Date().toJSON(); var userId = ''; var location = ref.id; - this.downloadQueue.set(ref.id, {ref, type, date, userId, location}); + this.downloadQueue.set(ref.id, { ref, type, date, userId, location }); this.downloadQueueTable.data = Array.from(this.downloadQueue.values()); } if (!this.downloadInProgress) { @@ -12672,7 +12672,7 @@ speechSynthesis.getVoices(); var { ref } = args; this.checkVRChatCache(ref).then((cacheSize) => { if (cacheSize === -1) { - this.downloadQueue.set(ref.id, {ref, type, userId, location}); + this.downloadQueue.set(ref.id, { ref, type, userId, location }); this.downloadQueueTable.data = Array.from(this.downloadQueue.values()); if (!this.downloadInProgress) { this.downloadVRChatCache(); @@ -12933,8 +12933,8 @@ speechSynthesis.getVoices(); var urlParams = new URLSearchParams(url.search); var worldId = urlParams.get('worldId'); var instanceId = urlParams.get('instanceId'); - if (instanceId) { - return `${worldId}:${instanceId}`; + if (instanceId) { + return `${worldId}:${instanceId}`; } else if (worldId) { return worldId; } @@ -12999,7 +12999,7 @@ speechSynthesis.getVoices(); this.userDialog.isFavoriteWorldsLoading = false; }; - $app.data.worldGroupVisibilityOptions = [ 'private', 'friends', 'public' ]; + $app.data.worldGroupVisibilityOptions = ['private', 'friends', 'public']; $app.methods.userFavoriteWorldsStatus = function (visibility) { var style = {}; diff --git a/html/src/index.pug b/html/src/index.pug index fed04e93..19c62b46 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -1725,7 +1725,9 @@ html //- dialog: update VRCX el-dialog.x-dialog(ref="VRCXUpdateDialog" :visible.sync="VRCXUpdateDialog.visible" title="VRCX Updater" width="400px") - div(v-loading="checkingForVRCXUpdate" style="margin-top:15px") + div(v-loading="checkingForVRCXUpdate" style="margin-top:15px") + template(v-if="!VRCXUpdateDialog.updatePending && VRCXUpdateDialog.release === appVersion") + span VRCX is up to date. template(v-if="VRCXUpdateDialog.updatePending") span Update ready for install, restart VRCX to apply. template(v-else)