From b7d7781c5d333ec618a97fb0cb9d814d83fb3098 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 09:56:03 -0800 Subject: [PATCH] Fix welcome page redirect, closed #70 --- app/assets/javascripts/welcome.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js index 56c454ac4..88b153af2 100644 --- a/app/assets/javascripts/welcome.js +++ b/app/assets/javascripts/welcome.js @@ -16,7 +16,7 @@ $(document).ready(function() { $('.start-mapping').attr('href', url); - } else if (navigator.geolocation) { + } else { function geoSuccess(position) { window.location = '/edit' + OSM.formatHash({ zoom: 17, @@ -27,21 +27,19 @@ $(document).ready(function() { $('.start-mapping').on('click', function(e) { e.preventDefault(); - - $('.start-mapping') - .addClass('loading'); + $('.start-mapping').addClass('loading'); // handle firefox's weird implementation // https://bugzilla.mozilla.org/show_bug.cgi?id=675533 window.setTimeout(manualEdit, 4000); - navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); + } }); - } else { - manualEdit(); } function manualEdit() { - window.location = '/?edit_help=1' + window.location = '/?edit_help=1'; } }); -- 2.43.2