marcel/better-xcloud
1
0
Fork 0
mirror of https://github.com/redphx/better-xcloud.git synced 2025-08-05 12:56:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace "#" with "private"

Browse Source
This commit is contained in:
redphx
2024-10-13 10:51:50 +07:00
parent 2eea9ce8f5
commit e4d73f9e36
7 changed files with 299 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/utils/toast.ts
View File

@@ -6,14 +6,14 @@ type ToastOptions = {
}
export class Toast {
static #$wrapper: HTMLElement;
static #$msg: HTMLElement;
static #$status: HTMLElement;
static #stack: Array<[string, string, ToastOptions]> = [];
static #isShowing = false;
private static $wrapper: HTMLElement;
private static $msg: HTMLElement;
private static $status: HTMLElement;
private static stack: Array<[string, string, ToastOptions]> = [];
private static isShowing = false;
static #timeout?: number | null;
static #DURATION = 3000;
private static timeout?: number | null;
private static DURATION = 3000;
static show(msg: string, status?: string, options: Partial<ToastOptions> = {}) {
options = options || {};
@@ -21,69 +21,70 @@ export class Toast {
const args = Array.from(arguments) as [string, string, ToastOptions];
if (options.instant) {
// Clear stack
Toast.#stack = [args];
Toast.#showNext();
Toast.stack = [args];
Toast.showNext();
} else {
Toast.#stack.push(args);
!Toast.#isShowing && Toast.#showNext();
Toast.stack.push(args);
!Toast.isShowing && Toast.showNext();
}
}
static #showNext() {
if (!Toast.#stack.length) {
Toast.#isShowing = false;
private static showNext() {
if (!Toast.stack.length) {
Toast.isShowing = false;
return;
}
Toast.#isShowing = true;
Toast.isShowing = true;
Toast.#timeout && clearTimeout(Toast.#timeout);
Toast.#timeout = window.setTimeout(Toast.#hide, Toast.#DURATION);
Toast.timeout && clearTimeout(Toast.timeout);
Toast.timeout = window.setTimeout(Toast.hide, Toast.DURATION);
// Get values from item
const [msg, status, options] = Toast.#stack.shift()!;
const [msg, status, options] = Toast.stack.shift()!;
if (options && options.html) {
Toast.#$msg.innerHTML = msg;
Toast.$msg.innerHTML = msg;
} else {
Toast.#$msg.textContent = msg;
Toast.$msg.textContent = msg;
}
if (status) {
Toast.#$status.classList.remove('bx-gone');
Toast.#$status.textContent = status;
Toast.$status.classList.remove('bx-gone');
Toast.$status.textContent = status;
} else {
Toast.#$status.classList.add('bx-gone');
Toast.$status.classList.add('bx-gone');
}
const classList = Toast.#$wrapper.classList;
const classList = Toast.$wrapper.classList;
classList.remove('bx-offscreen', 'bx-hide');
classList.add('bx-show');
}
static #hide() {
Toast.#timeout = null;
private static hide() {
Toast.timeout = null;
const classList = Toast.#$wrapper.classList;
const classList = Toast.$wrapper.classList;
classList.remove('bx-show');
classList.add('bx-hide');
}
static setup() {
Toast.#$wrapper = CE('div', {'class': 'bx-toast bx-offscreen'},
Toast.#$msg = CE('span', {'class': 'bx-toast-msg'}),
Toast.#$status = CE('span', {'class': 'bx-toast-status'}));
Toast.$wrapper = CE('div', {'class': 'bx-toast bx-offscreen'},
Toast.$msg = CE('span', {'class': 'bx-toast-msg'}),
Toast.$status = CE('span', {'class': 'bx-toast-status'}),
);
Toast.#$wrapper.addEventListener('transitionend', e => {
const classList = Toast.#$wrapper.classList;
Toast.$wrapper.addEventListener('transitionend', e => {
const classList = Toast.$wrapper.classList;
if (classList.contains('bx-hide')) {
classList.remove('bx-offscreen', 'bx-hide');
classList.add('bx-offscreen');
Toast.#showNext();
Toast.showNext();
}
});
document.documentElement.appendChild(Toast.#$wrapper);
document.documentElement.appendChild(Toast.$wrapper);
}
}

17
src/utils/xcloud-api.ts
View File

@@ -3,7 +3,6 @@ import { STATES } from "./global";
export class XcloudApi {
private static instance: XcloudApi;
public static getInstance(): XcloudApi {
if (!XcloudApi.instance) {
XcloudApi.instance = new XcloudApi();
@@ -12,12 +11,12 @@ export class XcloudApi {
return XcloudApi.instance;
}
#CACHE_TITLES: {[key: string]: XcloudTitleInfo} = {};
#CACHE_WAIT_TIME: {[key: string]: XcloudWaitTimeInfo} = {};
private CACHE_TITLES: {[key: string]: XcloudTitleInfo} = {};
private CACHE_WAIT_TIME: {[key: string]: XcloudWaitTimeInfo} = {};
async getTitleInfo(id: string): Promise<XcloudTitleInfo | null> {
if (id in this.#CACHE_TITLES) {
return this.#CACHE_TITLES[id];
if (id in this.CACHE_TITLES) {
return this.CACHE_TITLES[id];
}
const baseUri = STATES.selectedRegion.baseUri;
@@ -45,13 +44,13 @@ export class XcloudApi {
} catch (e) {
json = {}
}
this.#CACHE_TITLES[id] = json;
this.CACHE_TITLES[id] = json;
return json;
}
async getWaitTime(id: string): Promise<XcloudWaitTimeInfo | null> {
if (id in this.#CACHE_WAIT_TIME) {
return this.#CACHE_WAIT_TIME[id];
if (id in this.CACHE_WAIT_TIME) {
return this.CACHE_WAIT_TIME[id];
}
const baseUri = STATES.selectedRegion.baseUri;
@@ -73,7 +72,7 @@ export class XcloudApi {
json = {};
}
this.#CACHE_WAIT_TIME[id] = json;
this.CACHE_WAIT_TIME[id] = json;
return json;
}
}