mirror of
https://github.com/schlagmichdoch/PairDrop.git
synced 2025-04-21 07:16:18 -04:00
Fix inner text being cleared when viewing next received text from queue + prevent skipping of queue entry when timing is bad by checking for existing timeout
Co-authored-by: klmkyo <mail@mklimek.dev>
This commit is contained in:
parent
be46e7d4af
commit
35f47d9063
1 changed files with 12 additions and 9 deletions
|
@ -2017,6 +2017,7 @@ class ReceiveTextDialog extends Dialog {
|
||||||
|
|
||||||
this.$displayName = this.$el.querySelector('.display-name');
|
this.$displayName = this.$el.querySelector('.display-name');
|
||||||
this._receiveTextQueue = [];
|
this._receiveTextQueue = [];
|
||||||
|
this._hideTimeout = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
selectionEmpty() {
|
selectionEmpty() {
|
||||||
|
@ -2040,17 +2041,12 @@ class ReceiveTextDialog extends Dialog {
|
||||||
this._setDocumentTitleMessages();
|
this._setDocumentTitleMessages();
|
||||||
changeFavicon("images/favicon-96x96-notification.png");
|
changeFavicon("images/favicon-96x96-notification.png");
|
||||||
|
|
||||||
if (this.isShown()) return;
|
if (this.isShown() || this._hideTimeout) return;
|
||||||
|
|
||||||
this._dequeueRequests();
|
this._dequeueRequests();
|
||||||
}
|
}
|
||||||
|
|
||||||
_dequeueRequests() {
|
_dequeueRequests() {
|
||||||
if (!this._receiveTextQueue.length) {
|
|
||||||
this.$text.innerHTML = "";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this._setDocumentTitleMessages();
|
this._setDocumentTitleMessages();
|
||||||
changeFavicon("images/favicon-96x96-notification.png");
|
changeFavicon("images/favicon-96x96-notification.png");
|
||||||
|
|
||||||
|
@ -2145,9 +2141,16 @@ class ReceiveTextDialog extends Dialog {
|
||||||
|
|
||||||
hide() {
|
hide() {
|
||||||
super.hide();
|
super.hide();
|
||||||
setTimeout(() => {
|
|
||||||
this._dequeueRequests();
|
// If queue is empty -> clear text field | else -> open next message
|
||||||
|
this._hideTimeout = setTimeout(() => {
|
||||||
|
if (!this._receiveTextQueue.length) {
|
||||||
this.$text.innerHTML = "";
|
this.$text.innerHTML = "";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this._dequeueRequests();
|
||||||
|
}
|
||||||
|
this._hideTimeout = null;
|
||||||
}, 500);
|
}, 500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue