From 114f7228605213acd28d177c5262e5c74244b043 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 24 Nov 2013 16:45:45 +0000 Subject: [PATCH] Don't wait for a timeout when the browser doesn't support geolocation If the browser doesn't support geolocation then we might as well just start manual edit mode straight away rather than waiting four seconds. --- app/assets/javascripts/welcome.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js index 88b153af2..aa28e99e9 100644 --- a/app/assets/javascripts/welcome.js +++ b/app/assets/javascripts/welcome.js @@ -29,12 +29,14 @@ $(document).ready(function() { e.preventDefault(); $('.start-mapping').addClass('loading'); - // handle firefox's weird implementation - // https://bugzilla.mozilla.org/show_bug.cgi?id=675533 - window.setTimeout(manualEdit, 4000); - if (navigator.geolocation) { + // handle firefox's weird implementation + // https://bugzilla.mozilla.org/show_bug.cgi?id=675533 + window.setTimeout(manualEdit, 4000); + navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); + } else { + manualEdit(); } }); } -- 2.43.2