From: Tom Hughes <tom@compton.nu>
Date: Sun, 24 Nov 2013 16:45:45 +0000 (+0000)
Subject: Don't wait for a timeout when the browser doesn't support geolocation
X-Git-Tag: live~4661^2~20
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/114f7228605213acd28d177c5262e5c74244b043?hp=312bc4e72cdedc22dab831c8f5f23665e33bdc29

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.
---

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();
       }
     });
   }