make validation work properly

2 files changed, 10 insertions, 3 deletions

diff --git a/www/js/fixmystreet.js b/www/js/fixmystreet.js
index de04ae2..30b35a5 100644
--- a/www/js/fixmystreet.js
+++ b/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/www/js/mobile.js b/www/js/mobile.js
index 73bb10e..55fca3d 100644
--- a/www/js/mobile.js
+++ b/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',