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

Fix browser reloading when first message is sent by preventing event default on submit

Browse source
This commit is contained in:
schlagmichdoch 2023-03-02 16:30:47 +01:00
parent a1fdd81629
commit 545cdc2459
2 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
public/scripts/ui.js
View file

@ -759,7 +759,7 @@ class PairDeviceDialog extends Dialog {
this.$clearSecretsBtn = $('clear-pair-devices'); this.$clearSecretsBtn = $('clear-pair-devices');
this.$footerInstructionsPairedDevices = $('and-by-paired-devices'); this.$footerInstructionsPairedDevices = $('and-by-paired-devices');
let createJoinForm = this.$el.querySelector('form'); let createJoinForm = this.$el.querySelector('form');
createJoinForm.addEventListener('submit', _ => this._onSubmit()); createJoinForm.addEventListener('submit', e => this._onSubmit(e));
this.$el.querySelector('[close]').addEventListener('click', _ => this._pairDeviceCancel()) this.$el.querySelector('[close]').addEventListener('click', _ => this._pairDeviceCancel())
this.$inputRoomKeyChars.forEach(el => el.addEventListener('input', e => this._onCharsInput(e))); this.$inputRoomKeyChars.forEach(el => el.addEventListener('input', e => this._onCharsInput(e)));
@ -838,7 +838,7 @@ class PairDeviceDialog extends Dialog {
}) })
this.$submitBtn.removeAttribute("disabled"); this.$submitBtn.removeAttribute("disabled");
if (document.activeElement === this.$inputRoomKeyChars[5]) { if (document.activeElement === this.$inputRoomKeyChars[5]) {
this._onSubmit(); this._pairDeviceJoin(this.inputRoomKey);
} }
} }
} }
@ -888,7 +888,8 @@ class PairDeviceDialog extends Dialog {
return url.href; return url.href;
} }
_onSubmit() { _onSubmit(e) {
e.preventDefault();
this._pairDeviceJoin(this.inputRoomKey); this._pairDeviceJoin(this.inputRoomKey);
} }
@ -975,14 +976,19 @@ class ClearDevicesDialog extends Dialog {
super('clear-devices-dialog'); super('clear-devices-dialog');
$('clear-pair-devices').addEventListener('click', _ => this._onClearPairDevices()); $('clear-pair-devices').addEventListener('click', _ => this._onClearPairDevices());
let clearDevicesForm = this.$el.querySelector('form'); let clearDevicesForm = this.$el.querySelector('form');
clearDevicesForm.addEventListener('submit', _ => this._onSubmit()); clearDevicesForm.addEventListener('submit', e => this._onSubmit(e));
} }
_onClearPairDevices() { _onClearPairDevices() {
this.show(); this.show();
} }
_onSubmit() { _onSubmit(e) {
e.preventDefault();
this._clearRoomSecrets();
}
_clearRoomSecrets() {
Events.fire('clear-room-secrets'); Events.fire('clear-room-secrets');
this.hide(); this.hide();
} }
@ -996,7 +1002,7 @@ class SendTextDialog extends Dialog {
this.$peerDisplayName = this.$el.querySelector('#text-send-peer-display-name'); this.$peerDisplayName = this.$el.querySelector('#text-send-peer-display-name');
this.$form = this.$el.querySelector('form'); this.$form = this.$el.querySelector('form');
this.$submit = this.$el.querySelector('button[type="submit"]'); this.$submit = this.$el.querySelector('button[type="submit"]');
this.$form.addEventListener('submit', _ => this._send()); this.$form.addEventListener('submit', e => this._onSubmit(e));
this.$text.addEventListener('input', e => this._onChange(e)); this.$text.addEventListener('input', e => this._onChange(e));
Events.on("keydown", e => this._onKeyDown(e)); Events.on("keydown", e => this._onKeyDown(e));
} }
@ -1038,6 +1044,11 @@ class SendTextDialog extends Dialog {
sel.addRange(range); sel.addRange(range);
} }
_onSubmit(e) {
e.preventDefault();
this._send();
}
_send() { _send() {
Events.fire('send-text', { Events.fire('send-text', {
to: this.correspondingPeerId, to: this.correspondingPeerId,

23
public_included_ws_fallback/scripts/ui.js
View file

@ -760,7 +760,7 @@ class PairDeviceDialog extends Dialog {
this.$clearSecretsBtn = $('clear-pair-devices'); this.$clearSecretsBtn = $('clear-pair-devices');
this.$footerInstructionsPairedDevices = $('and-by-paired-devices'); this.$footerInstructionsPairedDevices = $('and-by-paired-devices');
let createJoinForm = this.$el.querySelector('form'); let createJoinForm = this.$el.querySelector('form');
createJoinForm.addEventListener('submit', _ => this._onSubmit()); createJoinForm.addEventListener('submit', e => this._onSubmit(e));
this.$el.querySelector('[close]').addEventListener('click', _ => this._pairDeviceCancel()) this.$el.querySelector('[close]').addEventListener('click', _ => this._pairDeviceCancel())
this.$inputRoomKeyChars.forEach(el => el.addEventListener('input', e => this._onCharsInput(e))); this.$inputRoomKeyChars.forEach(el => el.addEventListener('input', e => this._onCharsInput(e)));
@ -839,7 +839,7 @@ class PairDeviceDialog extends Dialog {
}) })
this.$submitBtn.removeAttribute("disabled"); this.$submitBtn.removeAttribute("disabled");
if (document.activeElement === this.$inputRoomKeyChars[5]) { if (document.activeElement === this.$inputRoomKeyChars[5]) {
this._onSubmit(); this._pairDeviceJoin(this.inputRoomKey);
} }
} }
} }
@ -889,7 +889,8 @@ class PairDeviceDialog extends Dialog {
return url.href; return url.href;
} }
_onSubmit() { _onSubmit(e) {
e.preventDefault();
this._pairDeviceJoin(this.inputRoomKey); this._pairDeviceJoin(this.inputRoomKey);
} }
@ -976,14 +977,19 @@ class ClearDevicesDialog extends Dialog {
super('clear-devices-dialog'); super('clear-devices-dialog');
$('clear-pair-devices').addEventListener('click', _ => this._onClearPairDevices()); $('clear-pair-devices').addEventListener('click', _ => this._onClearPairDevices());
let clearDevicesForm = this.$el.querySelector('form'); let clearDevicesForm = this.$el.querySelector('form');
clearDevicesForm.addEventListener('submit', _ => this._onSubmit()); clearDevicesForm.addEventListener('submit', e => this._onSubmit(e));
} }
_onClearPairDevices() { _onClearPairDevices() {
this.show(); this.show();
} }
_onSubmit() { _onSubmit(e) {
e.preventDefault();
this._clearRoomSecrets();
}
_clearRoomSecrets() {
Events.fire('clear-room-secrets'); Events.fire('clear-room-secrets');
this.hide(); this.hide();
} }
@ -997,7 +1003,7 @@ class SendTextDialog extends Dialog {
this.$peerDisplayName = this.$el.querySelector('#text-send-peer-display-name'); this.$peerDisplayName = this.$el.querySelector('#text-send-peer-display-name');
this.$form = this.$el.querySelector('form'); this.$form = this.$el.querySelector('form');
this.$submit = this.$el.querySelector('button[type="submit"]'); this.$submit = this.$el.querySelector('button[type="submit"]');
this.$form.addEventListener('submit', _ => this._send()); this.$form.addEventListener('submit', e => this._onSubmit(e));
this.$text.addEventListener('input', e => this._onChange(e)); this.$text.addEventListener('input', e => this._onChange(e));
Events.on("keydown", e => this._onKeyDown(e)); Events.on("keydown", e => this._onKeyDown(e));
} }
@ -1039,6 +1045,11 @@ class SendTextDialog extends Dialog {
sel.addRange(range); sel.addRange(range);
} }
_onSubmit(e) {
e.preventDefault();
this._send();
}
_send() { _send() {
Events.fire('send-text', { Events.fire('send-text', {
to: this.correspondingPeerId, to: this.correspondingPeerId,