Skip to content

Commit

Permalink
v2019.10.31
Browse files Browse the repository at this point in the history
  • Loading branch information
pypy committed Oct 30, 2019
1 parent 8789b48 commit b5cd4b3
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 6 deletions.
2 changes: 2 additions & 0 deletions html/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module.exports = {
'complexity': 0,
'default-case': 0,
'func-names': 0,
'function-call-argument-newline': 0,
'guard-for-in': 0,
'id-length': 0,
'indent': 0,
Expand All @@ -42,6 +43,7 @@ module.exports = {
'multiline-comment-style': 0,
'newline-per-chained-call': 0,
'new-cap': 0,
'no-bitwise': 0,
'no-console': 0,
'no-empty': ['error', { 'allowEmptyCatch': true }],
'no-magic-numbers': 0,
Expand Down
21 changes: 20 additions & 1 deletion html/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3471,7 +3471,7 @@ if (window.CefSharp) {
VRCX,
nextRefresh: 0,
isGameRunning: false,
appVersion: '2019.09.26',
appVersion: '2019.10.31',
latestAppVersion: '',
ossDialog: false
},
Expand Down Expand Up @@ -6147,6 +6147,25 @@ if (window.CefSharp) {
if (D.visible) {
if (command === 'Add Favorite') {
this.showFavoriteDialog('friend', D.id);
} else if (command === 'Show Avatar Author') {
var id = extractFileId(D.ref.currentAvatarImageUrl);
if (id) {
API.call(`file/${id}`).then((json) => {
if (D.id === json.ownerId) {
this.$message({
message: 'It is own avatar',
type: 'warning'
});
} else {
this.showUserDialog(json.ownerId);
}
});
} else {
this.$message({
message: 'Sorry, the author is unknown',
type: 'error'
});
}
} else if (command === 'Message') {
this.$prompt('Enter a message', 'Send Message', {
distinguishCancelAndClose: true,
Expand Down
7 changes: 4 additions & 3 deletions html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,7 @@
<el-dropdown trigger="click" @command="userDialogCommand" size="small">
<el-button :type="(userDialog.incomingRequest || userDialog.outgoingRequest) ? 'success' : (userDialog.isBlock || userDialog.isMute || userDialog.isHideAvatar) ? 'danger' : 'default'" icon="el-icon-more" circle></el-button>
<el-dropdown-menu #default="dropdown">
<el-dropdown-item icon="el-icon-s-custom" command="Show Avatar Author">Show Avatar Author</el-dropdown-item>
<template v-if="userDialog.isFriend">
<el-dropdown-item icon="el-icon-message" command="Message">Message</el-dropdown-item>
<el-dropdown-item icon="el-icon-delete" command="Unfriend" divided>Unfriend</el-dropdown-item>
Expand Down Expand Up @@ -1729,10 +1730,10 @@
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/noty/3.2.0-beta/noty.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.10/vue.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue-lazyload/1.3.1/vue-lazyload.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue-lazyload/1.3.3/vue-lazyload.js"></script>
<script src="https://unpkg.com/[email protected]/dist/data-tables.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.11.1/index.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.11.1/locale/en.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/index.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/locale/en.min.js"></script>
<script>
(() => {
var link = document.createElement('link');
Expand Down
4 changes: 2 additions & 2 deletions html/vr.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/noty/3.2.0-beta/noty.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.10/vue.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.11.1/index.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.11.1/locale/en.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/index.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/locale/en.min.js"></script>
<script>
(() => {
var link = document.createElement('link');
Expand Down

0 comments on commit b5cd4b3

Please sign in to comment.