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 88b153af2e44e784f7faa65c0285381a882bdb83..aa28e99e9d87f39748254951f99828e67242363a 100644 (file)
--- 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');
 
       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) {
       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();

       }
     });
   }
       }
     });
   }