marcel/better-xcloud
1
0
Fork 0
mirror of https://github.com/redphx/better-xcloud.git synced 2025-06-03 06:07:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix exception in app

Browse Source
This commit is contained in:
redphx 2024-12-09 18:18:40 +07:00
parent d0b84d4591
commit f0e4d4b8d0
4 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/better-xcloud.lite.user.js vendored
View File

@ -198,10 +198,14 @@ class BxEventBus {
let callbacks = this.listeners.get(event) || [];
for (let callback of callbacks)
callback(payload);
if (AppInterface) if (event in this.appJsInterfaces) {
let method = this.appJsInterfaces[event];
AppInterface[method] && AppInterface[method]();
} else AppInterface.onEventBus(this.group + "." + event);
if (AppInterface) try {
if (event in this.appJsInterfaces) {
let method = this.appJsInterfaces[event];
AppInterface[method] && AppInterface[method]();
} else AppInterface.onEventBus(this.group + "." + event);
} catch (e) {
console.log(e);
}
BX_FLAGS.Debug && BxLogger.warning("EventBus", "emit", event, payload);
}
}
@ -3381,7 +3385,8 @@ class NavigationDialogManager {
this.clearGamepadHoldingInterval(), BxEventBus.Script.emit("dialog.shown", {}), window.BX_EXPOSED.disableGamepadPolling = !0, document.body.classList.add("bx-no-scroll"), this.unmountCurrentDialog(), this.dialogsStack.push(dialog), this.dialog = dialog, dialog.onBeforeMount(configs), this.$container.appendChild(dialog.getContent()), dialog.onMounted(configs), this.$overlay.classList.remove("bx-gone"), this.$overlay.classList.toggle("bx-invisible", !dialog.isOverlayVisible()), this.$container.classList.remove("bx-gone"), this.$container.addEventListener("keydown", this), this.startGamepadPolling();
}
hide() {
if (this.clearGamepadHoldingInterval(), document.body.classList.remove("bx-no-scroll"), BxEventBus.Script.emit("dialog.dismissed", {}), this.$overlay.classList.add("bx-gone"), this.$overlay.classList.remove("bx-invisible"), this.$container.classList.add("bx-gone"), this.$container.removeEventListener("keydown", this), this.stopGamepadPolling(), this.dialog) {
if (this.clearGamepadHoldingInterval(), !this.isShowing()) return;
if (document.body.classList.remove("bx-no-scroll"), BxEventBus.Script.emit("dialog.dismissed", {}), this.$overlay.classList.add("bx-gone"), this.$overlay.classList.remove("bx-invisible"), this.$container.classList.add("bx-gone"), this.$container.removeEventListener("keydown", this), this.stopGamepadPolling(), this.dialog) {
let dialogIndex = this.dialogsStack.indexOf(this.dialog);
if (dialogIndex > -1) this.dialogsStack = this.dialogsStack.slice(0, dialogIndex);
}

15
dist/better-xcloud.user.js vendored
View File

@ -227,10 +227,14 @@ class BxEventBus {
let callbacks = this.listeners.get(event) || [];
for (let callback of callbacks)
callback(payload);
if (AppInterface) if (event in this.appJsInterfaces) {
let method = this.appJsInterfaces[event];
AppInterface[method] && AppInterface[method]();
} else AppInterface.onEventBus(this.group + "." + event);
if (AppInterface) try {
if (event in this.appJsInterfaces) {
let method = this.appJsInterfaces[event];
AppInterface[method] && AppInterface[method]();
} else AppInterface.onEventBus(this.group + "." + event);
} catch (e) {
console.log(e);
}
BX_FLAGS.Debug && BxLogger.warning("EventBus", "emit", event, payload);
}
}
@ -3534,7 +3538,8 @@ class NavigationDialogManager {
this.clearGamepadHoldingInterval(), BxEventBus.Script.emit("dialog.shown", {}), window.BX_EXPOSED.disableGamepadPolling = !0, document.body.classList.add("bx-no-scroll"), this.unmountCurrentDialog(), this.dialogsStack.push(dialog), this.dialog = dialog, dialog.onBeforeMount(configs), this.$container.appendChild(dialog.getContent()), dialog.onMounted(configs), this.$overlay.classList.remove("bx-gone"), this.$overlay.classList.toggle("bx-invisible", !dialog.isOverlayVisible()), this.$container.classList.remove("bx-gone"), this.$container.addEventListener("keydown", this), this.startGamepadPolling();
}
hide() {
if (this.clearGamepadHoldingInterval(), document.body.classList.remove("bx-no-scroll"), BxEventBus.Script.emit("dialog.dismissed", {}), this.$overlay.classList.add("bx-gone"), this.$overlay.classList.remove("bx-invisible"), this.$container.classList.add("bx-gone"), this.$container.removeEventListener("keydown", this), this.stopGamepadPolling(), this.dialog) {
if (this.clearGamepadHoldingInterval(), !this.isShowing()) return;
if (document.body.classList.remove("bx-no-scroll"), BxEventBus.Script.emit("dialog.dismissed", {}), this.$overlay.classList.add("bx-gone"), this.$overlay.classList.remove("bx-invisible"), this.$container.classList.add("bx-gone"), this.$container.removeEventListener("keydown", this), this.stopGamepadPolling(), this.dialog) {
let dialogIndex = this.dialogsStack.indexOf(this.dialog);
if (dialogIndex > -1) this.dialogsStack = this.dialogsStack.slice(0, dialogIndex);
}

3
src/modules/ui/dialog/navigation-dialog.ts
View File

@ -476,6 +476,9 @@ export class NavigationDialogManager {
hide() {
this.clearGamepadHoldingInterval();
if (!this.isShowing()) {
return;
}
// Unlock scroll bar
document.body.classList.remove('bx-no-scroll');

14
src/utils/bx-event-bus.ts
View File

@ -120,11 +120,15 @@ export class BxEventBus<TEvents extends Record<string, any>> {
// Call method inside Android app
if (AppInterface) {
if (event in this.appJsInterfaces) {
const method = this.appJsInterfaces[event];
AppInterface[method] && AppInterface[method]();
} else {
AppInterface.onEventBus(this.group + '.' + (event as string));
try {
if (event in this.appJsInterfaces) {
const method = this.appJsInterfaces[event];
AppInterface[method] && AppInterface[method]();
} else {
AppInterface.onEventBus(this.group + '.' + (event as string));
}
} catch (e) {
console.log(e);
}
}