aboutsummaryrefslogtreecommitdiffstats
path: root/www/js
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2012-11-15 17:38:33 +0000
committerStruan Donald <struan@exo.org.uk>2012-11-15 17:38:33 +0000
commit963cc0be63cf876a032ee09329ad7db0dbd17343 (patch)
tree50764b4a22aa539eebf68a4c91a36ce40ff5d6bf /www/js
parent8c241e8e65a686608c104ca5d2dae1ec33014224 (diff)
stop try again click bubbling through to hide pins link
be explicit about showing hiding pins rather than using show/hide toggle
Diffstat (limited to 'www/js')
-rw-r--r--www/js/mobile.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/www/js/mobile.js b/www/js/mobile.js
index da9d02b..21d7a30 100644
--- a/www/js/mobile.js
+++ b/www/js/mobile.js
@@ -455,9 +455,11 @@ function set_location() {
}
function mark_here() {
+ fixmystreet.state_pins_were_hidden = true;
if ( fixmystreet.markers.getVisibility() ) {
fixmystreet.state_pins_were_hidden = false;
- $('#hide_pins_link').click();
+ fixmystreet.markers.setVisibility(false);
+ fixmystreet.select_feature.deactivate();
}
fixmystreet.nav.deactivate();
@@ -471,14 +473,15 @@ function mark_here() {
'</p>' );
$('#mark-here').hide();
- $('#try_again').on('vclick', function(){
+ $('#try_again').on('vclick', function(e){
+ e.preventDefault();
fixmystreet.bbox_strategy.activate();
fixmystreet.markers.refresh( { force: true } );
if ( !fixmystreet.state_pins_were_hidden ) {
// If we had pins hidden when we clicked map (which had to show the pin layer as I'm doing it in one layer), hide them again.
- $('#hide_pins_link').click();
+ fixmystreet.markers.setVisibility(true);
+ fixmystreet.select_feature.activate();
}
- //fixmystreet.drag.deactivate();
$('#sub_map_links').show();
$('#mob_sub_map_links').remove();
$('#mark-here').show();