Avoid making the map scroll when adding a new note

[rails.git] / app / assets / javascripts / index / notes.js.erb

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index eecf91ef0d31862b1152c055654d35ca0a0ad7da..43374012963f271c4084cc5320b51c7dcdf89679 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -106,7 +106,13 @@ $(document).ready(function () {
   function popupOptions() {
     var mapSize = map.getSize();
 
-    return { maxHeight: mapSize.y * 2 / 3, autoPanPadding: new L.Point(60, 40) };
+    return { 
+      minWidth: 320,
+      maxWidth: mapSize.y * 1 / 3, 
+      maxHeight: mapSize.y * 2 / 3, 
+      offset: new L.Point(0, -3),
+      autoPanPadding: new L.Point(60, 40)
+    };
   }
 
   function createPopupContent(marker, properties) {
@@ -174,9 +180,27 @@ $(document).ready(function () {
   $("#createnoteanchor").click(function (e) {
     e.preventDefault();
 
+    if ($(e.target).hasClass("disabled")) return;
+
     map.addLayer(noteLayer);
 
-    var marker = L.marker(map.getCenter(), {
+    var mapSize = map.getSize();
+    var markerPosition;
+
+    if (mapSize.y > 800)
+    {
+      markerPosition = [mapSize.x / 2, mapSize.y / 2];
+    }
+    else if (mapSize.y > 400)
+    {
+      markerPosition = [mapSize.x / 2, 400];
+    }
+    else
+    {
+      markerPosition = [mapSize.x / 2, mapSize.y];
+    }
+
+    var marker = L.marker(map.containerPointToLatLng(markerPosition), {
       icon: noteIcons["new"],
       opacity: 0.7,
       draggable: true