mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Refactor phone number input view

Browse source 
Moves validation logic to its own view to be shared on index and options
pages.
This commit is contained in:
Emily Chao 2015-01-14 13:59:40 -10:00 • committed by lilia
parent 44007ca58f
commit 5d3020b9ed
8 changed files with 117 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

41
js/options.js
View file

@ -15,24 +15,6 @@
*/
;(function() {
function validateNumber() {
try {
var regionCode = $('#regionCode').val();
var number = $('#number').val();
var parsedNumber = libphonenumber.util.verifyNumber(number, regionCode);
$('#regionCode').val(libphonenumber.util.getRegionCodeForNumber(parsedNumber));
$('#number-container').removeClass('invalid');
$('#number-container').addClass('valid');
$('#request-sms, #request-voice').removeAttr('disabled');
return parsedNumber;
} catch(e) {
$('#number-container').removeClass('valid');
$('#request-sms, #request-voice').prop('disabled', 'disabled');
}
};
function validateCode() {
var verificationCode = $('#code').val().replace(/\D/g, '');
if (verificationCode.length == 6) {
@ -45,18 +27,19 @@
};
$(function() {
var phoneView = new Whisper.PhoneInputView({el: $('#phone-number-input')});
if (textsecure.registration.isDone()) {
$('#complete-number').text(textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0]);//TODO: no
$('#setup-complete').show().addClass('in');
} else {
$('#choose-setup').show().addClass('in');
$('#number').keyup(validateNumber);
$('#regionCode').change(validateNumber);
$.each(libphonenumber.util.getAllRegionCodes(), function (regionCode, countryName) {
$('#regionCode').append(
$('<option>', { value: regionCode, text: countryName })
);
$('input.number').on('keyup', function() {
if ($('#number-container').hasClass('valid')) {
$('#request-sms, #request-voice').removeAttr('disabled');
} else {
$('#request-sms, #request-voice').prop('disabled', 'disabled');
}
});
$('#code').on('change', function() {
@ -68,7 +51,7 @@
$('#request-voice').click(function() {
$('#error').hide();
var number = validateNumber();
var number = phoneView.validateNumber();
if (number) {
textsecure.api.requestVerificationVoice(number).catch(displayError);
$('#step2').addClass('in').fadeIn();
@ -79,7 +62,7 @@
$('#request-sms').click(function() {
$('#error').hide();
var number = validateNumber();
var number = phoneView.validateNumber();
if (number) {
textsecure.api.requestVerificationSMS(number).catch(displayError);
$('#step2').addClass('in').fadeIn();
@ -96,14 +79,14 @@
$('#single-device .back').click(function() {
$('#single-device').fadeOut(function() {
$('#choose-setup').addClass('in').fadeIn();
$('#number').removeClass('invalid');
$('input.number').removeClass('invalid');
});
});
$('#single-device form').submit(function(e) {
e.preventDefault();
$('#error').hide();
var number = validateNumber();
var number = phoneView.validateNumber();
var verificationCode = validateCode();
if (number && verificationCode) {
$('#verifyCode').prop('disabled', 'disabled');
@ -146,7 +129,7 @@
$('#multi-device .back').click(function() {
$('#multi-device').fadeOut(function() {
$('#choose-setup').addClass('in').fadeIn();
$('#number').removeClass('invalid');
$('input.number').removeClass('invalid');
});
});