diff options
| -rw-r--r-- | phonegap/www/js/fixmystreet.js | 9 | ||||
| -rw-r--r-- | phonegap/www/js/mobile.js | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/phonegap/www/js/fixmystreet.js b/phonegap/www/js/fixmystreet.js index de04ae2b6..30b35a5d6 100644 --- a/phonegap/www/js/fixmystreet.js +++ b/phonegap/www/js/fixmystreet.js @@ -186,8 +186,6 @@ $(function(){ if (form.submit_problem) { $('input[type=submit]', form).prop("disabled", true); } - - // form.submit(); }, // make sure we can see the error message when we focus on invalid elements showErrors: function( errorMap, errorList ) { @@ -197,7 +195,12 @@ $(function(){ this.defaultShowErrors(); submitted = false; }, - invalidHandler: function(form, validator) { submitted = true; } + invalidHandler: function(form, validator) { + form.stopImmediatePropagation(); + form.stopPropagation(); + form.preventDefault(); + submitted = true; + } }); $('input[type=submit]').click( function(e) { form_submitted = 1; } ); diff --git a/phonegap/www/js/mobile.js b/phonegap/www/js/mobile.js index 73bb10e38..55fca3d76 100644 --- a/phonegap/www/js/mobile.js +++ b/phonegap/www/js/mobile.js @@ -197,6 +197,10 @@ function fileUploadFail() { function postReport(e) { e.preventDefault(); + + // the .stopImmediatePropogation call in invalidHandler should render this + // redundant but it doesn't seem to work so belt and braces :( + if ( !$('#map_form').valid() ) { return; } var params = { service: 'iphone', |