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

Small changes and fixes

Browse Source
This commit is contained in:
Natsumi
2021-07-28 22:20:52 +12:00
parent 6225586c85
commit a502db185c
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
html/src/app.js
View File

@@ -403,7 +403,7 @@ speechSynthesis.getVoices();
if (response.status === 200) {
this.$throw(0, 'Invalid JSON response');
}
this.$throw(response.status);
this.$throw(response.status, endpoint);
return {};
}).then(({ data, status }) => {
if (status === 200) {
@@ -846,7 +846,7 @@ speechSynthesis.getVoices();
});
Vue.component('avatar-info', {
template: '<div @click="confirm" style="cursor:pointer;width:fit-content;display:inline-block;vertical-align:top"><span style="display:inline-block;margin-right:5px">{{ avatarName }}</span><span :class="color">{{ avatarType }}</span></div>',
template: '<div @click="confirm" class="avatar-info"><span style="display:inline-block;margin-right:5px">{{ avatarName }}</span><span :class="color">{{ avatarType }}</span></div>',
props: {
imageurl: String,
userid: String,
@@ -5139,6 +5139,9 @@ speechSynthesis.getVoices();
};
API.$on('AUTOLOGIN', function () {
if ($app.enablePrimaryPassword) {
return;
}
var user = $app.loginForm.savedCredentials[$app.loginForm.lastUserLoggedIn];
if (typeof user !== 'undefined') {
$app.relogin({
@@ -12426,7 +12429,7 @@ speechSynthesis.getVoices();
$app.methods.queueCacheDownload = function (ref, type) {
if (!this.downloadQueue.has(ref.id)) {
var date = new Date().toJSON();
var userId = API.currentUser.id;
var userId = '';
var location = ref.id;
this.downloadQueue.set(ref.id, {ref, type, date, userId, location});
this.downloadQueueTable.data = Array.from(this.downloadQueue.values());

7
html/src/app.scss
View File

@@ -577,6 +577,13 @@ i.x-user-status.busy {
border-color: #e6a23c !important;
}
.avatar-info {
cursor: pointer;
width: fit-content;
display: inline-block;
vertical-align: top;
}
.avatar-info-own {
display: inline-block;
color: #e6a23c;

6
html/src/index.pug
View File

@@ -37,7 +37,7 @@ html
el-form-item(label="Password" prop="password" required)
el-input(type="password" v-model="loginForm.password" name="password" placeholder="Password" clearable show-password)
el-checkbox(v-model="loginForm.saveCredentials") Save Credentials
el-form-item(style="margin-top:35px")
el-form-item(style="margin-top:15px")
el-button(native-type="submit" type="primary" :loading="loginForm.loading" style="width:100%") Login
el-form-item
el-button(:loading="loginForm.loading" style="width:100%" @click="loginWithSteam()") Login with Steam
@@ -1647,7 +1647,7 @@ html
span(v-text="item.name" style="word-break:keep-all")
|:
el-input(v-model="VRChatConfigFile[value]" :placeholder="item.default" size="mini" :type="item.type?item.type:'text'" :min="item.min" :max="item.max")
div(style="margin-top:10px")
div(style="display:inline-block;margin-top:10px")
span Camera Resolution
br
el-dropdown(@command="(command) => setVRChatCameraResolution(command)" size="small" trigger="click" style="margin-top:5px")
@@ -1655,7 +1655,7 @@ html
span #[span(v-text="getVRChatCameraResolution()")] #[i.el-icon-arrow-down.el-icon--right]
el-dropdown-menu(#default="dropdown")
el-dropdown-item(v-for="row in VRChatResolutions" :key="row.index" v-text="row.name" :command="row")
div(style="margin-top:10px")
div(style="display:inline-block;margin-top:10px;margin-left:10px")
span Screenshot Resolution
br
el-dropdown(@command="(command) => setVRChatScreenshotResolution(command)" size="small" trigger="click" style="margin-top:5px")