Don't wait for a timeout when the browser doesn't support geolocation

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

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index 291c8652382a85ab4cee1414eb6ce5d962a8bfef..5a19cb4d63a2679be1c6d20e8f2ec9e42cbb8ac3 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -1,5 +1,5 @@
 $(document).ready(function () {
 $(document).ready(function () {

-  var marker;
+  var marker, map;

 
   function setLocation(e) {
     $("#latitude").val(e.latlng.lat);
 
   function setLocation(e) {
     $("#latitude").val(e.latlng.lat);


@@ -21,7 +21,15 @@ $(document).ready(function () {
 
     var params = $("#map").data();
     var centre = [params.lat, params.lon];
 
     var params = $("#map").data();
     var centre = [params.lat, params.lon];

-    var map = createMap("map");
+    var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+    map = L.map("map", {
+      attributionControl: false,
+      zoomControl: false
+    }).addLayer(new L.OSM.Mapnik());
+
+    L.OSM.zoom({position: position})
+      .addTo(map);

 
     map.setView(centre, params.zoom);
 
 
     map.setView(centre, params.zoom);