aboutsummaryrefslogtreecommitdiffstats
path: root/www/js/views/submit.js
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2013-03-06 17:31:38 +0000
committerStruan Donald <struan@exo.org.uk>2013-03-06 17:31:38 +0000
commit907c33498346aaba7efe4f8b549af26f49366832 (patch)
treeb5442b967cd55d26310f1077e1bcef0445501d26 /www/js/views/submit.js
parent5990502bf95e91036529a379a12c0d1f448ec197 (diff)
if we get to the password screen from the name details screen then register/change password rather than signing in
Diffstat (limited to 'www/js/views/submit.js')
-rw-r--r--www/js/views/submit.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/www/js/views/submit.js b/www/js/views/submit.js
index c85f80d..11f2ffa 100644
--- a/www/js/views/submit.js
+++ b/www/js/views/submit.js
@@ -158,6 +158,7 @@
onClickPassword: function() {
if ( this.validate() ) {
+ this.model.set('submit_clicked', 'submit_register');
FMS.currentUser.set('name', $('#form_name').val());
FMS.currentUser.set('phone', $('#form_phone').val());
this.navigate( 'submit-password' );
@@ -208,7 +209,10 @@
this.model.set('submit_clicked', '');
FMS.currentUser.set('name', $('#form_name').val());
} else {
- this.model.set('submit_clicked', 'submit_sign_in');
+ // if this is set then we are registering a password
+ if ( ! this.model.get('submit_clicked') ) {
+ this.model.set('submit_clicked', 'submit_sign_in');
+ }
FMS.currentUser.set('password', $('#form_password').val());
}
},