Merge remote-tracking branch 'upstream/master' into routing

[rails.git] / app / assets / javascripts / welcome.js

diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js
index 56c454ac4aeaa731d63b064f56db39f6a1c7315b..aa28e99e9d87f39748254951f99828e67242363a 100644 (file)
--- 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,21 @@ $(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);
+      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);
+        navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit);
+      } else {
+        manualEdit();
+      }
     });
-  } else {
-    manualEdit();
   }
 
   function manualEdit() {
-    window.location = '/?edit_help=1'
+    window.location = '/?edit_help=1';
   }
 });