diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/views/submit.js | 7 | ||||
| -rw-r--r-- | www/templates/en/submit_password.html | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/www/js/views/submit.js b/www/js/views/submit.js index 4380007..e385359 100644 --- a/www/js/views/submit.js +++ b/www/js/views/submit.js @@ -32,6 +32,8 @@ }, onClickSubmit: function(e) { + // in case we are getting here from a form submission + e.preventDefault(); this.beforeSubmit(); if ( this.validate() ) { @@ -204,7 +206,8 @@ 'pageshow': 'afterDisplay', 'click .ui-btn-left': 'onClickButtonPrev', 'click #report': 'onClickSubmit', - 'click #confirm_name': 'onClickSubmit' + 'click #confirm_name': 'onClickSubmit', + 'submit #passwordForm': 'onClickSubmit' }, initialize: function() { @@ -247,10 +250,12 @@ $('#form_name').val(err.check_name); $('#password_row').hide(); $('#check_name').show(); + $('#confirm_name').focus(); } else { if ( err.errors && err.errors.password ) { this.validationError('form_password', err.errors.password ); } + $('#report').focus(); } } diff --git a/www/templates/en/submit_password.html b/www/templates/en/submit_password.html index e1af0d0..045885f 100644 --- a/www/templates/en/submit_password.html +++ b/www/templates/en/submit_password.html @@ -3,13 +3,14 @@ </div> <div data-role="content"> + <form id="passwordForm" name="passwordForm"> <div id="password_row"> <div class="inputcard"> <div> <input data-role="none" type="password" value="" name="password" id="form_password" placeholder="Your password" required> </div> </div> - <input data-role="button" data-theme="a" type="button" id="report" name="report" value="Report"> + <input data-role="button" data-theme="a" type="submit" id="report" name="report" value="Report"> </div> <div id="check_name" class="nodisplay"> <div class="inputcard"> @@ -26,6 +27,7 @@ </fieldset> </div> </div> - <input data-role="button" data-theme="a" type="button" id="report" name="report" value="Confirm name"> + <input data-role="button" data-theme="a" type="submit" id="confirm_name" name="report" value="Confirm name"> </div> + </form> </div> |