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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Kamiya
2023-01-01 13:31:54 +08:00
committed by GitHub
parent 376e368856 b5edf2a37b
commit 65238b7006
41 changed files with 69 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
html/src/vr.js
View File

@@ -392,10 +392,34 @@ Vue.component('marquee-text', MarqueeText);
devices.forEach((device) => {
device[2] = parseInt(device[2], 10);
});
devices.sort((a, b) => {
if (a[0] === b[0]) {
return 0;
}
if (a[0] === 'base') {
return 1;
}
if (a[0].toLowerCase().includes('controller')) {
return -1;
}
return 0;
});
devices.sort((a, b) => {
if (a[1] === b[1]) {
return 0;
}
if (a[1] === 'connected') {
return -1;
}
if (a[1] === 'disconnected') {
return 1;
}
return 0;
});
this.devices = devices;
});
} else {
this.devices = '';
this.devices = [];
}
if (this.config.pcUptimeOnFeed) {
AppApi.GetUptime().then((uptime) => {