thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix overly hidden elements on registration page

Browse source 
Latest bootstrap css is really aggressive about hiding things.
This commit is contained in:
lilia 2014-10-30 14:20:42 -07:00
parent 2ec6a66daf
commit ca7ba43b13
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
js/options.js
View file

@ -41,16 +41,16 @@
}; };
function displayError(error) { function displayError(error) {
$('#error').hide().text(error).fadeIn(); $('#error').hide().text(error).addClass('in').fadeIn();
}; };
textsecure.registerOnLoadFunction(function() { textsecure.registerOnLoadFunction(function() {
$(function() { $(function() {
if (isRegistrationDone()) { if (isRegistrationDone()) {
$('#complete-number').text(textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0]);//TODO: no $('#complete-number').text(textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0]);//TODO: no
$('#setup-complete').show(); $('#setup-complete').show().addClass('in');
} else { } else {
$('#choose-setup').show(); $('#choose-setup').show().addClass('in');
$('#number').keyup(validateNumber); $('#number').keyup(validateNumber);
$('#regionCode').change(validateNumber); $('#regionCode').change(validateNumber);
@ -71,7 +71,7 @@
var number = validateNumber(); var number = validateNumber();
if (number) { if (number) {
textsecure.api.requestVerificationVoice(number).catch(displayError); textsecure.api.requestVerificationVoice(number).catch(displayError);
$('#step2').fadeIn(); $('#step2').addClass('in').fadeIn();
} else { } else {
$('#number-container').addClass('invalid'); $('#number-container').addClass('invalid');
} }
@ -81,7 +81,7 @@
var number = validateNumber(); var number = validateNumber();
if (number) { if (number) {
textsecure.api.requestVerificationSMS(number).catch(displayError); textsecure.api.requestVerificationSMS(number).catch(displayError);
$('#step2').fadeIn(); $('#step2').addClass('in').fadeIn();
} else { } else {
$('#number-container').addClass('invalid'); $('#number-container').addClass('invalid');
} }
@ -89,12 +89,12 @@
$('#new-account').click(function(){ $('#new-account').click(function(){
$('#choose-setup').fadeOut(function() { $('#choose-setup').fadeOut(function() {
$('#single-device').fadeIn(); $('#single-device').addClass('in').fadeIn();
}); });
$('#single-device .back').click(function() { $('#single-device .back').click(function() {
$('#single-device').fadeOut(function() { $('#single-device').fadeOut(function() {
$('#choose-setup').fadeIn(); $('#choose-setup').addClass('in').fadeIn();
$('#number').removeClass('invalid'); $('#number').removeClass('invalid');
}); });
}); });
@ -110,7 +110,7 @@
$('#verify3done').text(''); $('#verify3done').text('');
$('#verify4done').text(''); $('#verify4done').text('');
$('#verify5').hide(); $('#verify5').hide();
$('#verify').show(); $('#verify').show().addClass('in');
textsecure.registerSingleDevice(number, verificationCode, function(step) { textsecure.registerSingleDevice(number, verificationCode, function(step) {
switch(step) { switch(step) {
@ -123,7 +123,7 @@
case 3: case 3:
$('#complete-number').text(number); $('#complete-number').text(number);
$('#verify').hide(); $('#verify').hide();
$('#setup-complete').show(); $('#setup-complete').show().addClass('in');
registrationDone(); registrationDone();
} }
}).catch(function(error) { }).catch(function(error) {
@ -139,12 +139,12 @@
$('#new-device').click(function(){ $('#new-device').click(function(){
$('#choose-setup').fadeOut(function() { $('#choose-setup').fadeOut(function() {
$('#multi-device').fadeIn(); $('#multi-device').addClass('in').fadeIn();
}); });
$('#multi-device .back').click(function() { $('#multi-device .back').click(function() {
$('#multi-device').fadeOut(function() { $('#multi-device').fadeOut(function() {
$('#choose-setup').fadeIn(); $('#choose-setup').addClass('in').fadeIn();
$('#number').removeClass('invalid'); $('#number').removeClass('invalid');
}); });
}); });
@ -170,7 +170,7 @@
$('#verify3done').text(''); $('#verify3done').text('');
$('#verify4done').text(''); $('#verify4done').text('');
$('#verify5done').text(''); $('#verify5done').text('');
$('#verify').show(); $('#verify').show().addClass('in');
textsecure.registerSecondDevice(cryptoInfo, message.message, function(step) { textsecure.registerSecondDevice(cryptoInfo, message.message, function(step) {
@ -190,7 +190,7 @@
$('#verify4done').text('done'); $('#verify4done').text('done');
case 5: case 5:
$('#verify').hide(); $('#verify').hide();
$('#setup-complete').show(); $('#setup-complete').show().addClass('in');
registrationDone(); registrationDone();
} }
}); });