From 8c79800cee92704cc68539e6248dc61aeea7c732 Mon Sep 17 00:00:00 2001 From: Beaudan Brown Date: Tue, 12 Nov 2019 16:40:15 +1100 Subject: [PATCH] Use oninput for secondary devices names and allow for consecutive pairings without closing the dialog --- js/views/app_view.js | 2 +- js/views/device_pairing_dialog_view.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/views/app_view.js b/js/views/app_view.js index 4bf1ec5e0..afd2536b7 100644 --- a/js/views/app_view.js +++ b/js/views/app_view.js @@ -213,7 +213,7 @@ Whisper.events.off('devicePairingRequestReceived'); }); - dialog.once('devicePairingRequestAccepted', (pubKey, cb) => + dialog.on('devicePairingRequestAccepted', (pubKey, cb) => Whisper.events.trigger('devicePairingRequestAccepted', pubKey, cb) ); dialog.on('devicePairingRequestRejected', pubKey => diff --git a/js/views/device_pairing_dialog_view.js b/js/views/device_pairing_dialog_view.js index 7dd49cbc1..d32105ea8 100644 --- a/js/views/device_pairing_dialog_view.js +++ b/js/views/device_pairing_dialog_view.js @@ -92,7 +92,7 @@ if (!errors) { this.$('.transmissionStatus').text(i18n('provideDeviceAlias')); this.$('#deviceAliasView').show(); - this.$('#deviceAlias').on('keydown', e => { + this.$('#deviceAlias').on('input', e => { if (e.target.value.trim()) { this.$('.requestAcceptedView .ok').removeAttr('disabled'); } else {