Merge remote-tracking branch 'upstream/pull/4200'

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

diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js
index 88b153af2e44e784f7faa65c0285381a882bdb83..35a1fdc4bdfc6a864e05ea52a2f5a37859f05daf 100644 (file)
--- a/app/assets/javascripts/welcome.js
+++ b/app/assets/javascripts/welcome.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+$(document).ready(function () {

   var params = OSM.params();
 
   if (params.lat && params.lon) {
   var params = OSM.params();
 
   if (params.lat && params.lon) {


@@ -6,40 +6,41 @@ $(document).ready(function() {
     params.lon = parseFloat(params.lon);
     params.zoom = params.zoom || 17;
 
     params.lon = parseFloat(params.lon);
     params.zoom = params.zoom || 17;
 

-    var url = '/edit';
+    var url = "/edit";

 
     if (params.editor) {
 
     if (params.editor) {

-      url += '?editor=' + params.editor;
+      url += "?editor=" + params.editor;

     }
 
     url += OSM.formatHash(params);
 
     }
 
     url += OSM.formatHash(params);
 

-    $('.start-mapping').attr('href', url);
-
+    $(".start-mapping").attr("href", url);

   } else {
   } else {

-    function geoSuccess(position) {
-      window.location = '/edit' + OSM.formatHash({
+    var geoSuccess = function (position) {
+      window.location = "/edit" + OSM.formatHash({

         zoom: 17,
         lat: position.coords.latitude,
         lon: position.coords.longitude
       });
         zoom: 17,
         lat: position.coords.latitude,
         lon: position.coords.longitude
       });

-    }
+    };

 
 

-    $('.start-mapping').on('click', function(e) {
+    $(".start-mapping").on("click", function (e) {

       e.preventDefault();
       e.preventDefault();

-      $('.start-mapping').addClass('loading');
-
-      // handle firefox's weird implementation
-      // https://bugzilla.mozilla.org/show_bug.cgi?id=675533
-      window.setTimeout(manualEdit, 4000);
+      $(".start-mapping").addClass("loading");

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

       }
     });
   }
 
   function manualEdit() {
       }
     });
   }
 
   function manualEdit() {

-    window.location = '/?edit_help=1';
+    window.location = "/?edit_help=1";

   }
 });
   }
 });