mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-04-26 02:03:49 +02:00
refactor: dialogs (#1224)
* refactor: dialogs * fix: storeAvatarImage * FriendLog.vue * FriendLog.vue * FriendLog.vue * GameLog.vue * fix: next day button jumping to the wrong date * sync master * fix: launchGame * Notification.vue * Feed.vue * Search.vue * Profile.vue * PlayerList.vue * Login.vue * utils * update dialog * del gameLog.pug * fix * fix: group role cannot be displayed currently * fix: "Hide Friends in Same Instance" hides players in unrelated private instances (#1210) * fix * fix: "Hide Friends in Same Instance" does not work when "Split Favorite Friends" is enabled * fix Notification.vue message * fix: deleteFavoriteNoConfirm * fix: feed status style * fix: infinite loading when deleting note * fix: private players will not be hidden when 'Hide Friends in Same Instance', and 'Hide Friends in Same Instance' will not work when 'Split Favorite Friends'
This commit is contained in:
11
src/vr.js
11
src/vr.js
@@ -15,6 +15,7 @@ import VueI18n from 'vue-i18n';
|
||||
import ElementUI from 'element-ui';
|
||||
import * as workerTimers from 'worker-timers';
|
||||
import MarqueeText from 'vue-marquee-text-component';
|
||||
import { displayLocation, parseLocation } from './composables/instance/utils';
|
||||
import * as localizedStrings from './localization/localizedStrings.js';
|
||||
|
||||
import $utils from './classes/utils.js';
|
||||
@@ -79,7 +80,7 @@ Vue.component('marquee-text', MarqueeText);
|
||||
methods: {
|
||||
parse() {
|
||||
this.text = this.location;
|
||||
var L = $utils.parseLocation(this.location);
|
||||
var L = parseLocation(this.location);
|
||||
if (L.isOffline) {
|
||||
this.text = 'Offline';
|
||||
} else if (L.isPrivate) {
|
||||
@@ -396,7 +397,7 @@ Vue.component('marquee-text', MarqueeText);
|
||||
case 'GPS':
|
||||
text = `<strong>${
|
||||
noty.displayName
|
||||
}</strong> is in ${this.displayLocation(
|
||||
}</strong> is in ${displayLocation(
|
||||
noty.location,
|
||||
noty.worldName,
|
||||
noty.groupName
|
||||
@@ -405,7 +406,7 @@ Vue.component('marquee-text', MarqueeText);
|
||||
case 'Online':
|
||||
var locationName = '';
|
||||
if (noty.worldName) {
|
||||
locationName = ` to ${this.displayLocation(
|
||||
locationName = ` to ${displayLocation(
|
||||
noty.location,
|
||||
noty.worldName,
|
||||
noty.groupName
|
||||
@@ -422,7 +423,7 @@ Vue.component('marquee-text', MarqueeText);
|
||||
case 'invite':
|
||||
text = `<strong>${
|
||||
noty.senderUsername
|
||||
}</strong> has invited you to ${this.displayLocation(
|
||||
}</strong> has invited you to ${displayLocation(
|
||||
noty.details.worldId,
|
||||
noty.details.worldName
|
||||
)}${message}`;
|
||||
@@ -482,7 +483,7 @@ Vue.component('marquee-text', MarqueeText);
|
||||
if (noty.displayName) {
|
||||
text = `<strong>${
|
||||
noty.displayName
|
||||
}</strong> has spawned a portal to ${this.displayLocation(
|
||||
}</strong> has spawned a portal to ${displayLocation(
|
||||
noty.instanceId,
|
||||
noty.worldName,
|
||||
noty.groupName
|
||||
|
||||
Reference in New Issue
Block a user