Simplify close icon for routing panel and fix validation error

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

diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js
index 88b153af2e44e784f7faa65c0285381a882bdb83..5ba0d7cd2183e28f3ffcbaa88d5901eefece4531 100644 (file)
--- a/app/assets/javascripts/welcome.js
+++ b/app/assets/javascripts/welcome.js
@@ -17,24 +17,26 @@ $(document).ready(function() {
     $('.start-mapping').attr('href', url);
 
   } else {
     $('.start-mapping').attr('href', url);
 
   } else {

-    function geoSuccess(position) {
+    var geoSuccess = function (position) {

       window.location = '/edit' + OSM.formatHash({
         zoom: 17,
         lat: position.coords.latitude,
         lon: position.coords.longitude
       });
       window.location = '/edit' + OSM.formatHash({
         zoom: 17,
         lat: position.coords.latitude,
         lon: position.coords.longitude
       });

-    }
+    };

 
     $('.start-mapping').on('click', function(e) {
       e.preventDefault();
       $('.start-mapping').addClass('loading');
 
 
     $('.start-mapping').on('click', function(e) {
       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();

       }
     });
   }
       }
     });
   }