From c2c068a0a55766f8236d67b29756a4211e06fa11 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Mon, 5 Dec 2011 15:40:48 +0000 Subject: fix to js validation when map clicking is skipped --- web/js/fixmystreet.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'web/js') diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 638930a35..524bcdafa 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -4,11 +4,20 @@ */ function form_category_onchange() { - $.getJSON('/report/new/category_extras', { - latitude: fixmystreet.latitude, - longitude: fixmystreet.longitude, - category: this.options[ this.selectedIndex ].text, - }, function(data) { + var cat = $('#form_category'); + var args = { + category: cat.val() + }; + + if ( typeof fixmystreet !== 'undefined' ) { + args['latitude'] = fixmystreet.latitude; + args['longitude'] = fixmystreet.longitude; + } else { + args['latitude'] = $('input[name="latitude"]').val(); + args['longitude'] = $('input[name="longitude"]').val(); + } + + $.getJSON('/report/new/category_extras', args, function(data) { if ( data.category_extra ) { if ( $('#category_meta').size() ) { $('#category_meta').html( data.category_extra); -- cgit v1.2.3 From e0a99bd0baf619879a4cc304b9ba22df20506fa1 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 20 Dec 2011 09:54:17 +0000 Subject: Putting in a bad comma to test. --- web/js/fixmystreet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/js') diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 524bcdafa..fcbec4743 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -6,7 +6,7 @@ function form_category_onchange() { var cat = $('#form_category'); var args = { - category: cat.val() + category: cat.val(), }; if ( typeof fixmystreet !== 'undefined' ) { -- cgit v1.2.3 From 60850afdddb183d84a344afb212163b0e8dd8789 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 20 Dec 2011 09:54:38 +0000 Subject: Revert "Putting in a bad comma to test." This reverts commit e0a99bd0baf619879a4cc304b9ba22df20506fa1. --- web/js/fixmystreet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/js') diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index fcbec4743..524bcdafa 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -6,7 +6,7 @@ function form_category_onchange() { var cat = $('#form_category'); var args = { - category: cat.val(), + category: cat.val() }; if ( typeof fixmystreet !== 'undefined' ) { -- cgit v1.2.3