From 5d044bd00e52a0b762eb63847c9619f3dedae6eb Mon Sep 17 00:00:00 2001 From: lilia Date: Sat, 17 Jan 2015 22:51:32 -1000 Subject: [PATCH] Fire an event on phone number validation Fix a bug introduced by recent phone number input work that prevented the call and sms buttons from being clickable. --- js/options.js | 2 +- js/views/phone-input-view.js | 5 ++++- options.html | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/options.js b/js/options.js index 9240b50de4..75d1149a3b 100644 --- a/js/options.js +++ b/js/options.js @@ -34,7 +34,7 @@ } else { $('#choose-setup').show().addClass('in'); - $('input.number').on('keyup', function() { + $('input.number').on('validation', function() { if ($('#number-container').hasClass('valid')) { $('#request-sms, #request-voice').removeAttr('disabled'); } else { diff --git a/js/views/phone-input-view.js b/js/views/phone-input-view.js index 03ba21a9be..867ae48534 100644 --- a/js/views/phone-input-view.js +++ b/js/views/phone-input-view.js @@ -38,9 +38,10 @@ var Whisper = Whisper || {}; }, validateNumber: function() { + var input = this.$el.find('input.number'); try { var regionCode = this.$el.find('li.active').attr('data-country-code').toUpperCase(); - var number = this.$el.find('input.number').val(); + var number = input.val(); var parsedNumber = libphonenumber.util.verifyNumber(number, regionCode); @@ -49,6 +50,8 @@ var Whisper = Whisper || {}; return parsedNumber; } catch(e) { this.$el.find('.number-container').removeClass('valid'); + } finally { + input.trigger('validation'); } } }); diff --git a/options.html b/options.html index 31b3e51fbc..3c8bd86415 100644 --- a/options.html +++ b/options.html @@ -87,7 +87,7 @@