From 195d9b4e10132018859ff120c89819c1f94fa7ed Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 11:11:47 +0000 Subject: Bugfix. --- web/js/map-OpenLayers.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 2375d5eb8..0ed66ca53 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -406,7 +406,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#hide_pins_link').click(); } if (fixmystreet.page == 'new') { - return true; + return false; } $.getJSON('/report/new/ajax', { latitude: $('#fixmystreet\\.latitude').val(), @@ -420,7 +420,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#form_category').change( form_category_onchange ); } }); - return false; + return lonlat; }, locate_report_mobile: function(e) { @@ -432,7 +432,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }, locate_report: function(e) { - if (this.locate_report_pin_and_council(e)) { + var lonlat = this.locate_report_pin_and_council(e); + if (!lonlat) { return; } $('#side-form, #site-logo').show(); -- cgit v1.2.3 From be88a751f3f3febe9b71d5148d68d839b7601de8 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 11:29:08 +0000 Subject: Green pin when creating, for #250. --- web/js/map-OpenLayers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 0ed66ca53..8d8f03e37 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -392,7 +392,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { /* Already have a pin */ fixmystreet.markers.features[0].move(lonlat); } else { - var markers = fms_markers_list( [ [ lonlat.lat, lonlat.lon, 'yellow' ] ], false ); + var markers = fms_markers_list( [ [ lonlat.lat, lonlat.lon, 'green' ] ], false ); fixmystreet.bbox_strategy.deactivate(); fixmystreet.markers.removeAllFeatures(); fixmystreet.markers.addFeatures( markers ); -- cgit v1.2.3 From 6be95b8b2f9530e58652710eef0e39836980e0bc Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 11:31:00 +0000 Subject: Function return has reversed. --- web/js/map-OpenLayers.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 8d8f03e37..f9c2efcaf 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -424,7 +424,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }, locate_report_mobile: function(e) { - if (this.locate_report_pin_and_council(e)) { + var lonlat = this.locate_report_pin_and_council(e); + if (!lonlat) { return; } fixmystreet.page = 'new'; -- cgit v1.2.3