Always center map on marker

[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 4264e56161f1c921b94163f3d8cf5a629da67963..62572cf695a0f626caf7a12fb866fcc0b1b78d0f 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -34,7 +34,7 @@ L.OSM.share = function (options) {
         $('<h4>')
           .text(I18n.t('javascripts.share.title')));
 
-    // Link / Embed
+    // Link
 
     var $linkSection = $('<div>')
       .attr('class', 'section share-link')
@@ -61,20 +61,6 @@ L.OSM.share = function (options) {
               .bind('change', toggleMarker))
           .append(I18n.t('javascripts.share.include_marker')));
 
-    $('<div>')
-      .attr('class', 'form-row')
-      .appendTo($form)
-      .append(
-        $('<label>')
-          .attr('for', 'center_marker')
-          .append(
-            $('<input>')
-              .attr('id', 'center_marker')
-              .attr('type', 'checkbox')
-              .prop('checked', true)
-              .bind('change', update))
-          .append(I18n.t('javascripts.share.center_marker')));
-
     $('<div>')
       .attr('class', 'form-row')
       .appendTo($form)
@@ -105,6 +91,16 @@ L.OSM.share = function (options) {
         .attr('type', 'text')
         .on('click', select));
 
+    // Embed
+
+    var $embedSection = $('<div>')
+      .attr('class', 'section share-embed')
+      .appendTo($ui);
+
+    var $form = $('<form>')
+      .attr('class', 'standard-form')
+      .appendTo($embedSection);
+
     $('<div>')
       .attr('class', 'form-row')
       .appendTo($form)
@@ -257,7 +253,7 @@ L.OSM.share = function (options) {
     }
 
     function update() {
-      if (map.hasLayer(marker) && $('#center_marker').is(':checked')) {
+      if (map.hasLayer(marker)) {
         map.panTo(marker.getLatLng());
       }
 
@@ -266,9 +262,6 @@ L.OSM.share = function (options) {
       $('#link_marker')
         .prop('checked', map.hasLayer(marker));
 
-      $('#center_marker')
-        .prop('disabled', !map.hasLayer(marker));
-
       $('#image_filter')
         .prop('checked', locationFilter.isEnabled());
 
@@ -290,9 +283,9 @@ L.OSM.share = function (options) {
 
       $('#embed_html').val(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +
-          'http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params) +
+          escapeHTML('http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
           '" style="border: 1px solid black"></iframe><br/>' +
-          '<small><a href="' + map.getUrl(marker) + '</a></small>');
+          '<small><a href="' + escapeHTML(map.getUrl(marker)) + '</a></small>');
 
       // Image