Made top & bottom spacing in directions list consistent.

[rails.git] / app / assets / javascripts / leaflet.share.js

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index d58b62313b21eb62c918f5d8b1a4b1e92b637417..d4c82953202cb9a4e828a042a10f0efc064bbdee 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -13,7 +13,7 @@ L.OSM.share = function (options) {
     var button = $('<a>')
       .attr('class', 'control-button')
       .attr('href', '#')
     var button = $('<a>')
       .attr('class', 'control-button')
       .attr('href', '#')

-      .attr('title', 'Share')
+      .attr('title', I18n.t('javascripts.share.title'))

       .html('<span class="icon share"></span>')
       .on('click', toggle)
       .appendTo($container);
       .html('<span class="icon share"></span>')
       .on('click', toggle)
       .appendTo($container);


@@ -25,10 +25,9 @@ L.OSM.share = function (options) {
       .attr('class', 'sidebar_heading')
       .appendTo($ui)
       .append(
       .attr('class', 'sidebar_heading')
       .appendTo($ui)
       .append(

-        $('<a>')
+        $('<span>')

           .text(I18n.t('javascripts.close'))
           .text(I18n.t('javascripts.close'))

-          .attr('class', 'sidebar_close')
-          .attr('href', '#')
+          .attr('class', 'icon close')

           .bind('click', toggle))
       .append(
         $('<h4>')
           .bind('click', toggle))
       .append(
         $('<h4>')


@@ -206,8 +205,9 @@ L.OSM.share = function (options) {
       .on('change', update)
       .addTo(map);
 
       .on('change', update)
       .addTo(map);
 

+    marker.on('dragend', movedMarker);
+    map.on('move', movedMap);

     map.on('moveend layeradd layerremove', update);
     map.on('moveend layeradd layerremove', update);

-    marker.on('dragend', update);

 
     options.sidebar.addPane($ui);
 
 
     options.sidebar.addPane($ui);
 


@@ -216,6 +216,7 @@ L.OSM.share = function (options) {
 
     function hidden() {
       map.removeLayer(marker);
 
     function hidden() {
       map.removeLayer(marker);

+      map.options.scrollWheelZoom = map.options.doubleClickZoom = true;

       locationFilter.disable();
       update();
     }
       locationFilter.disable();
       update();
     }


@@ -229,14 +230,17 @@ L.OSM.share = function (options) {
 
       update();
       options.sidebar.togglePane($ui, button);
 
       update();
       options.sidebar.togglePane($ui, button);

+      $('.leaflet-control .control-button').tooltip('hide');

     }
 
     function toggleMarker() {
       if ($(this).is(':checked')) {
         marker.setLatLng(map.getCenter());
         map.addLayer(marker);
     }
 
     function toggleMarker() {
       if ($(this).is(':checked')) {
         marker.setLatLng(map.getCenter());
         map.addLayer(marker);

+        map.options.scrollWheelZoom = map.options.doubleClickZoom = 'center';

       } else {
         map.removeLayer(marker);
       } else {
         map.removeLayer(marker);

+        map.options.scrollWheelZoom = map.options.doubleClickZoom = true;

       }
       update();
     }
       }
       update();
     }


@@ -251,11 +255,26 @@ L.OSM.share = function (options) {
       update();
     }
 
       update();
     }
 

-    function update() {
+    function movedMap() {
+      marker.setLatLng(map.getCenter());
+      update();
+    }
+
+    function movedMarker() {

       if (map.hasLayer(marker)) {
       if (map.hasLayer(marker)) {

+        map.off('move', movedMap);
+        map.on('moveend', updateOnce);

         map.panTo(marker.getLatLng());
       }
         map.panTo(marker.getLatLng());
       }

+    }

 
 

+    function updateOnce() {
+      map.off('moveend', updateOnce);
+      map.on('move', movedMap);
+      update();
+    }
+
+    function update() {

       var bounds = map.getBounds();
 
       $('#link_marker')
       var bounds = map.getBounds();
 
       $('#link_marker')


@@ -277,14 +296,16 @@ L.OSM.share = function (options) {
       };
 
       if (map.hasLayer(marker)) {
       };
 
       if (map.hasLayer(marker)) {

-        params.marker = marker.getLatLng().lat + ',' + marker.getLatLng().lng;
+        var latLng = marker.getLatLng().wrap();
+        params.marker = latLng.lat + ',' + latLng.lng;

       }
 
       $('#embed_html').val(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +
           escapeHTML('http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
           '" style="border: 1px solid black"></iframe><br/>' +
       }
 
       $('#embed_html').val(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +
           escapeHTML('http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
           '" style="border: 1px solid black"></iframe><br/>' +

-          '<small><a href="' + escapeHTML(map.getUrl(marker)) + '</a></small>');
+          '<small><a href="' + escapeHTML(map.getUrl(marker)) + '">' +
+          escapeHTML(I18n.t('javascripts.share.view_larger_map')) + '</a></small>');

 
       // Image
 
 
       // Image