diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-06-25 14:33:57 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-06-25 14:33:57 +0100 |
| commit | f9fe02f91ac72ea2954ee68a5f32d96a237fcd67 (patch) | |
| tree | f91d63ab3d6b9cd3555587090a541c870ecd3363 /web/js/fixmystreet.js | |
| parent | 67da8efc720d2d0bd22bd9fe8655b7e983b35bb4 (diff) | |
| parent | 45b3040884d7089e7d8c6f4acccd657b91c92a04 (diff) | |
Merge branch 'master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'web/js/fixmystreet.js')
| -rw-r--r-- | web/js/fixmystreet.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 36d47b5b2..b689d501c 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -47,7 +47,7 @@ $(function(){ jQuery.validator.addMethod('validName', function(value, element) { var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i; - return this.optional(element) || value.length > 5 && value.match( /\S/ ) && !value.match( validNamePat ); }, validation_strings.category ); + return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, validation_strings.category ); var form_submitted = 0; var submitted = false; @@ -108,7 +108,10 @@ $(function(){ $('#submit_register').click( function(e) { $('#form_category').addClass('required validCategory').removeClass('valid'); - $('#form_name').addClass('required validName'); + $('#form_name').addClass('required'); + if ( $('#mapForm').length ) { + $('#form_name').addClass('validName'); + } $('#form_first_name').addClass('required'); $('#form_last_name').addClass('required'); $('#form_fms_extra_title').addClass('required'); @@ -116,7 +119,10 @@ $(function(){ $('#problem_submit > input[type="submit"]').click( function(e) { $('#form_category').addClass('required validCategory').removeClass('valid'); - $('#form_name').addClass('required validName'); + $('#form_name').addClass('required'); + if ( $('#mapForm').length ) { + $('#form_name').addClass('validName'); + } $('#form_first_name').addClass('required'); $('#form_last_name').addClass('required'); $('#form_fms_extra_title').addClass('required'); |