aboutsummaryrefslogtreecommitdiffstats
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/app.js2
-rw-r--r--www/js/views/submit.js33
2 files changed, 31 insertions, 4 deletions
diff --git a/www/js/app.js b/www/js/app.js
index 80f1f4b..5c3b655 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -38,7 +38,7 @@ var tpl = {
(function (FMS, Backbone, _, $) {
_.extend(FMS, {
templates: [
- 'home', 'around', 'offline', 'save_offline', 'reports', 'login', 'address_search', 'existing', 'photo', 'details', 'details_extra', 'submit', 'submit_email', 'submit_name', 'submit_password', 'submit_confirm', 'sent'
+ 'home', 'around', 'offline', 'save_offline', 'reports', 'login', 'address_search', 'existing', 'photo', 'details', 'details_extra', 'submit', 'submit_email', 'submit_name', 'submit_set_password', 'submit_password', 'submit_confirm', 'sent'
],
isLoggedIn: 0,
diff --git a/www/js/views/submit.js b/www/js/views/submit.js
index 3f4a035..6b7529e 100644
--- a/www/js/views/submit.js
+++ b/www/js/views/submit.js
@@ -119,6 +119,7 @@
'pagebeforeshow': 'beforeDisplay',
'pageshow': 'afterDisplay',
'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick #set_password': 'onClickSetPassword',
'vclick #have_password': 'onClickPassword',
'vclick #email_confirm': 'onClickConfirm'
},
@@ -140,6 +141,14 @@
return isValid;
},
+ onClickSetPassword: function(e) {
+ e.preventDefault();
+ if ( this.validate() ) {
+ FMS.currentUser.set('email', $('#form_email').val());
+ this.navigate( 'submit-set-password' );
+ }
+ },
+
onClickPassword: function(e) {
e.preventDefault();
if ( this.validate() ) {
@@ -307,9 +316,27 @@
(function (FMS, Backbone, _, $) {
_.extend( FMS, {
SubmitSetPasswordView: FMS.SubmitPasswordView.extend({
- template: 'submit_password',
- id: 'submit--set-password-page',
- prev: 'submit-name'
+ template: 'submit_set_password',
+ id: 'submit-set-password-page',
+ prev: 'submit-email',
+ next: 'submit-name',
+
+ events: {
+ 'pagehide': 'destroy',
+ 'pagebeforeshow': 'beforeDisplay',
+ 'pageshow': 'afterDisplay',
+ 'vclick .ui-btn-left': 'onClickButtonPrev',
+ 'vclick #continue': 'onClickContinue',
+ 'submit #passwordForm': 'onClickContinue'
+ },
+
+ onClickContinue: function(e) {
+ e.preventDefault();
+ $('#continue').focus();
+ this.model.set('submit_clicked', 'submit_sign_in');
+ FMS.currentUser.set('password', $('#form_password').val());
+ this.navigate( this.next );
+ }
})
});
})(FMS, Backbone, _, $);