aboutsummaryrefslogtreecommitdiffstats
path: root/www/js
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2012-11-13 17:09:29 +0000
committerStruan Donald <struan@exo.org.uk>2012-11-13 19:55:48 +0000
commit2c552ed7cf3b6e697b5b662852abed8afb68d4c6 (patch)
tree62062c1cb6571fcec390b0cb3538d289da364a3a /www/js
parent4560f0adbebb3493aa90dad7a8c938d3a24d4ae7 (diff)
fix user login not being saved on form submit
fix logged in user sometimes not being asked to confirm name
Diffstat (limited to 'www/js')
-rw-r--r--www/js/mobile.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/www/js/mobile.js b/www/js/mobile.js
index b33f454..242790d 100644
--- a/www/js/mobile.js
+++ b/www/js/mobile.js
@@ -321,7 +321,9 @@ function postReport(e) {
params.password_sign_in = localStorage.password;
params.submit_sign_in = 1;
} else {
- params.name = $('#form_name').val();
+ if ( $('#form_name').val() !== '' ) {
+ params.name = $('#form_name').val();
+ }
params.email = $('#form_email').val();
params.password_sign_in = $('#password_sign_in').val();
@@ -357,15 +359,15 @@ function postReport(e) {
localStorage.long = null;
if ( data.report ) {
localStorage.report = data.report;
+ if ( !localStorage.name && $('#password_sign_in').val() ) {
+ localStorage.name = $('#form_name').val();
+ localStorage.username = $('#form_email').val();
+ localStorage.password = $('#password_sign_in').val();
+ }
$.mobile.changePage('report_created.html');
} else {
$.mobile.changePage('email_sent.html');
}
- if ( !localStorage.name && $('#password_sign_in').val() ) {
- localStorage.name = $('#form_name').val();
- localStorage.username = $('#form_email').val();
- localStorage.password = $('#password_sign_in').val();
- }
remove_saved_report();
} else {
if ( data.check_name ) {