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

Set VRCX branch at startup

Browse Source
This commit is contained in:
Natsumi
2022-10-29 06:07:01 +13:00
parent 0340a3198c
commit 4236067e2e
2 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
html/src/app.js
View File

@@ -4350,6 +4350,7 @@ speechSynthesis.getVoices();
AppApi.GetVersion().then((version) => {
this.appVersion = version;
this.comapreAppVersion();
this.setBranch();
});
API.$on('SHOW_WORLD_DIALOG', (tag) => this.showWorldDialog(tag));
API.$on('SHOW_LAUNCH_DIALOG', (tag) => this.showLaunchDialog(tag));
@@ -4424,6 +4425,18 @@ speechSynthesis.getVoices();
}
};
$app.methods.setBranch = function () {
if (!this.appVersion) {
return;
}
if (this.appVersion.includes('VRCX Nightly')) {
this.branch = 'Nightly';
} else {
this.branch = 'Stable';
}
configRepository.setString('VRCX_branch', this.branch);
};
$app.methods.openChangeLog = function () {
this.$confirm('Open Change Log?', 'VRCX has updated', {
confirmButtonText: 'Open',
@@ -8924,6 +8937,9 @@ speechSynthesis.getVoices();
dtNow > bias2 ||
this.lastLocation.playerList.size <= 1
) {
if (this.photonLobbyTimeout.length > 0) {
AppApi.ExecuteVrOverlayFunction('updateHudTimeout', '[]');
}
this.photonLobbyTimeout = [];
workerTimers.setTimeout(() => this.photonLobbyWatcher(), 500);
return;
@@ -9578,7 +9594,8 @@ speechSynthesis.getVoices();
);
return args;
})
.catch(() => {
.catch((err) => {
console.log('PortalSpawn', err);
this.parsePhotonPortalSpawn(
datetime,
'',
@@ -13152,10 +13169,10 @@ speechSynthesis.getVoices();
if (!input) {
return false;
}
var testUrl = input.substring(0, 15);
if (this.directAccessWorld(input)) {
if (this.directAccessWorld(input.trim())) {
return true;
}
var testUrl = input.substring(0, 15);
if (testUrl === 'https://vrchat.') {
var url = new URL(input);
var urlPath = url.pathname;