mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-20 23:16:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make "Connecting..." toast persistent until connection is established

Browse source
This commit is contained in:
schlagmichdoch 2023-10-12 03:39:37 +02:00
parent 4e00e5b358
commit 684fe7142d
4 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
public/scripts/network.js
View file

@ -38,6 +38,12 @@ class ServerConnection {
_connect() { _connect() {
clearTimeout(this._reconnectTimer); clearTimeout(this._reconnectTimer);
if (this._isConnected() || this._isConnecting()) return; if (this._isConnected() || this._isConnecting()) return;
if (this._isReconnect) {
Events.fire('notify-user', {
message: Localization.getTranslation("notifications.connecting"),
persistent: true
});
}
const ws = new WebSocket(this._endpoint()); const ws = new WebSocket(this._endpoint());
ws.binaryType = 'arraybuffer'; ws.binaryType = 'arraybuffer';
ws.onopen = _ => this._onOpen(); ws.onopen = _ => this._onOpen();
@ -221,12 +227,10 @@ class ServerConnection {
_onDisconnect() { _onDisconnect() {
console.log('WS: server disconnected'); console.log('WS: server disconnected');
setTimeout(() => { setTimeout(() => {
Events.fire('notify-user', Localization.getTranslation("notifications.connecting"));
}, 100); //delay for 100ms to prevent flickering on page reload
clearTimeout(this._reconnectTimer);
this._reconnectTimer = setTimeout(_ => this._connect(), 1000);
Events.fire('ws-disconnected');
this._isReconnect = true; this._isReconnect = true;
Events.fire('ws-disconnected');
this._reconnectTimer = setTimeout(_ => this._connect(), 1000);
}, 100); //delay for 100ms to prevent flickering on page reload
} }
_onVisibilityChange() { _onVisibilityChange() {

7
public/scripts/ui.js
View file

@ -2044,9 +2044,12 @@ class Toast extends Dialog {
_onNotify(message) { _onNotify(message) {
if (this.hideTimeout) clearTimeout(this.hideTimeout); if (this.hideTimeout) clearTimeout(this.hideTimeout);
this.$el.innerText = message; this.$el.innerText = typeof message === "object" ? message.message : message;
this.show(); this.show();
this.hideTimeout = setTimeout(_ => this.hide(), 5000);
if (typeof message === "object" && message.persistent) return;
this.hideTimeout = setTimeout(() => this.hide(), 5000);
} }
} }

14
public_included_ws_fallback/scripts/network.js
View file

@ -36,6 +36,12 @@ class ServerConnection {
_connect() { _connect() {
clearTimeout(this._reconnectTimer); clearTimeout(this._reconnectTimer);
if (this._isConnected() || this._isConnecting()) return; if (this._isConnected() || this._isConnecting()) return;
if (this._isReconnect) {
Events.fire('notify-user', {
message: Localization.getTranslation("notifications.connecting"),
persistent: true
});
}
const ws = new WebSocket(this._endpoint()); const ws = new WebSocket(this._endpoint());
ws.binaryType = 'arraybuffer'; ws.binaryType = 'arraybuffer';
ws.onopen = _ => this._onOpen(); ws.onopen = _ => this._onOpen();
@ -232,12 +238,10 @@ class ServerConnection {
_onDisconnect() { _onDisconnect() {
console.log('WS: server disconnected'); console.log('WS: server disconnected');
setTimeout(() => { setTimeout(() => {
Events.fire('notify-user', Localization.getTranslation("notifications.connecting"));
}, 100); //delay for 100ms to prevent flickering on page reload
clearTimeout(this._reconnectTimer);
this._reconnectTimer = setTimeout(_ => this._connect(), 1000);
Events.fire('ws-disconnected');
this._isReconnect = true; this._isReconnect = true;
Events.fire('ws-disconnected');
this._reconnectTimer = setTimeout(_ => this._connect(), 1000);
}, 100); //delay for 100ms to prevent flickering on page reload
} }
_onVisibilityChange() { _onVisibilityChange() {

7
public_included_ws_fallback/scripts/ui.js
View file

@ -2046,9 +2046,12 @@ class Toast extends Dialog {
_onNotify(message) { _onNotify(message) {
if (this.hideTimeout) clearTimeout(this.hideTimeout); if (this.hideTimeout) clearTimeout(this.hideTimeout);
this.$el.innerText = message; this.$el.innerText = typeof message === "object" ? message.message : message;
this.show(); this.show();
this.hideTimeout = setTimeout(_ => this.hide(), 5000);
if (typeof message === "object" && message.persistent) return;
this.hideTimeout = setTimeout(() => this.hide(), 5000);
} }
} }