Avoid double-escaping display names when sent through the translation system

[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 b991210dfad5a063fcc48d76181c0deb5e72a2c6..eedfe3ab34abfab47f41ee4619fdf0ee6065337a 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -1,233 +1,249 @@
 L.OSM.share = function (options) {
   var control = L.control(options),
 L.OSM.share = function (options) {
   var control = L.control(options),

-    marker = L.marker([0, 0], {draggable: true}),
-    locationFilter = new L.LocationFilter({
-      enableButton: false,
-      adjustButton: false
-    });
+      marker = L.marker([0, 0], { draggable: true }),
+      locationFilter = new L.LocationFilter({
+        enableButton: false,
+        adjustButton: false
+      });

 
   control.onAdd = function (map) {
 
   control.onAdd = function (map) {

-    var $container = $('<div>')
-      .attr('class', 'control-share');
-
-    var button = $('<a>')
-      .attr('class', 'control-button')
-      .attr('href', '#')
-      .attr('title', I18n.t('javascripts.share.title'))
-      .html('<span class="icon share"></span>')
-      .on('click', toggle)
+    var $container = $("<div>")
+      .attr("class", "control-share");
+
+    var button = $("<a>")
+      .attr("class", "control-button")
+      .attr("href", "#")
+      .attr("title", I18n.t("javascripts.share.title"))
+      .html("<span class=\"icon share\"></span>")
+      .on("click", toggle)

       .appendTo($container);
 
       .appendTo($container);
 

-    var $ui = $('<div>')
-      .attr('class', 'share-ui');
+    var $ui = $("<div>")
+      .attr("class", "share-ui");

 
 

-    $('<div>')
-      .attr('class', 'sidebar_heading')
+    $("<div>")
+      .attr("class", "sidebar_heading")

       .appendTo($ui)
       .append(
       .appendTo($ui)
       .append(

-        $('<span>')
-          .text(I18n.t('javascripts.close'))
-          .attr('class', 'icon close')
-          .bind('click', toggle))
+        $("<span>")
+          .text(I18n.t("javascripts.close"))
+          .attr("class", "icon close")
+          .bind("click", toggle))

       .append(
       .append(

-        $('<h4>')
-          .text(I18n.t('javascripts.share.title')));
+        $("<h4>")
+          .text(I18n.t("javascripts.share.title")));

 
     // Link / Embed
 
 
     // Link / Embed
 

-    var $linkSection = $('<div>')
-      .attr('class', 'section share-link')
+    var $linkSection = $("<div>")
+      .attr("class", "section share-link")

       .appendTo($ui);
 
       .appendTo($ui);
 

-    $('<h4>')
-      .text(I18n.t('javascripts.share.link'))
+    $("<h4>")
+      .text(I18n.t("javascripts.share.link"))

       .appendTo($linkSection);
 
       .appendTo($linkSection);
 

-    var $form = $('<form>')
-      .attr('class', 'standard-form')
+    var $form = $("<form>")
+      .attr("class", "standard-form")

       .appendTo($linkSection);
 
       .appendTo($linkSection);
 

-    $('<div>')
-      .attr('class', 'form-row')
+    $("<div>")
+      .attr("class", "form-row")

       .appendTo($form)
       .append(
       .appendTo($form)
       .append(

-        $('<label>')
-          .attr('for', 'link_marker')
+        $("<label>")
+          .attr("for", "link_marker")

           .append(
           .append(

-            $('<input>')
-              .attr('id', 'link_marker')
-              .attr('type', 'checkbox')
-              .bind('change', toggleMarker))
-          .append(I18n.t('javascripts.share.include_marker')));
-
-    $('<div>')
-      .attr('class', 'share-tabs')
+            $("<input>")
+              .attr("id", "link_marker")
+              .attr("type", "checkbox")
+              .bind("change", toggleMarker))
+          .append(I18n.t("javascripts.share.include_marker")));
+
+    $("<div>")
+      .attr("class", "share-tabs")

       .appendTo($form)
       .appendTo($form)

-      .append($('<a>')
-        .attr('class', 'active')
-        .attr('for', 'long_input')
-        .attr('id', 'long_link')
-        .text(I18n.t('javascripts.share.long_link')))
-      .append($('<a>')
-        .attr('for', 'short_input')
-        .attr('id', 'short_link')
-        .text(I18n.t('javascripts.share.short_link')))
-      .append($('<a>')
-        .attr('for', 'embed_html')
-        .attr('href', '#')
-        .text(I18n.t('javascripts.share.embed')))
-      .on('click', 'a', function(e) {
+      .append($("<a>")
+        .attr("class", "active")
+        .attr("for", "long_input")
+        .attr("id", "long_link")
+        .text(I18n.t("javascripts.share.long_link")))
+      .append($("<a>")
+        .attr("for", "short_input")
+        .attr("id", "short_link")
+        .text(I18n.t("javascripts.share.short_link")))
+      .append($("<a>")
+        .attr("for", "embed_html")
+        .attr("href", "#")
+        .text(I18n.t("javascripts.share.embed")))
+      .on("click", "a", function (e) {

         e.preventDefault();
         e.preventDefault();

-        var id = '#' + $(this).attr('for');
-        $linkSection.find('.share-tabs a')
-          .removeClass('active');
-        $(this).addClass('active');
-        $linkSection.find('.share-tab')
+        var id = "#" + $(this).attr("for");
+        $linkSection.find(".share-tabs a")
+          .removeClass("active");
+        $(this).addClass("active");
+        $linkSection.find(".share-tab")

           .hide();
           .hide();

-        $linkSection.find('.share-tab:has(' + id + ')')
+        $linkSection.find(".share-tab:has(" + id + ")")

           .show()
           .show()

-          .find('input, textarea')
+          .find("input, textarea")

           .select();
       });
 
           .select();
       });
 

-    $('<div>')
-      .attr('class', 'form-row share-tab')
-      .css('display', 'block')
+    $("<div>")
+      .attr("class", "form-row share-tab")
+      .css("display", "block")

       .appendTo($form)
       .appendTo($form)

-      .append($('<input>')
-        .attr('id', 'long_input')
-        .attr('type', 'text')
-        .on('click', select));
+      .append($("<input>")
+        .attr("id", "long_input")
+        .attr("type", "text")
+        .on("click", select));

 
 

-    $('<div>')
-      .attr('class', 'form-row share-tab')
+    $("<div>")
+      .attr("class", "form-row share-tab")

       .appendTo($form)
       .appendTo($form)

-      .append($('<input>')
-        .attr('id', 'short_input')
-        .attr('type', 'text')
-        .on('click', select));
+      .append($("<input>")
+        .attr("id", "short_input")
+        .attr("type", "text")
+        .on("click", select));

 
 

-    $('<div>')
-      .attr('class', 'form-row share-tab')
+    $("<div>")
+      .attr("class", "form-row share-tab")

       .appendTo($form)
       .append(
       .appendTo($form)
       .append(

-        $('<textarea>')
-          .attr('id', 'embed_html')
-          .on('click', select))
+        $("<textarea>")
+          .attr("id", "embed_html")
+          .on("click", select))

       .append(
       .append(

-        $('<p>')
-          .attr('class', 'deemphasize')
-          .text(I18n.t('javascripts.share.paste_html'))
+        $("<p>")
+          .attr("class", "deemphasize")
+          .text(I18n.t("javascripts.share.paste_html"))

           .appendTo($linkSection));
 
     // Geo URI
 
           .appendTo($linkSection));
 
     // Geo URI
 

-    var $geoUriSection = $('<div>')
-      .attr('class', 'section share-geo-uri')
+    var $geoUriSection = $("<div>")
+      .attr("class", "section share-geo-uri")

       .appendTo($ui);
 
       .appendTo($ui);
 

-    $('<h4>')
-      .text(I18n.t('javascripts.share.geo_uri'))
+    $("<h4>")
+      .text(I18n.t("javascripts.share.geo_uri"))

       .appendTo($geoUriSection);
 
       .appendTo($geoUriSection);
 

-    $('<div>')
+    $("<div>")

       .appendTo($geoUriSection)
       .appendTo($geoUriSection)

-      .append($('<a>')
-        .attr('id', 'geo_uri'));
+      .append($("<a>")
+        .attr("id", "geo_uri"));

 
     // Image
 
 
     // Image
 

-    var $imageSection = $('<div>')
-      .attr('class', 'section share-image')
+    var $imageSection = $("<div>")
+      .attr("class", "section share-image")

       .appendTo($ui);
 
       .appendTo($ui);
 

-    $('<h4>')
-      .text(I18n.t('javascripts.share.image'))
+    $("<h4>")
+      .text(I18n.t("javascripts.share.image"))

       .appendTo($imageSection);
 
       .appendTo($imageSection);
 

-    $form = $('<form>')
-      .attr('class', 'standard-form')
-      .attr('action', '/export/finish')
-      .attr('method', 'post')
+    $("<div>")
+      .attr("id", "export-warning")
+      .attr("class", "deemphasize")
+      .text(I18n.t("javascripts.share.only_standard_layer"))

       .appendTo($imageSection);
 
       .appendTo($imageSection);
 

-    $('<div>')
-      .attr('class', 'form-row')
+    $form = $("<form>")
+      .attr("id", "export-image")
+      .attr("class", "standard-form")
+      .attr("action", "/export/finish")
+      .attr("method", "post")
+      .appendTo($imageSection);
+
+    $("<div>")
+      .attr("class", "form-row")

       .appendTo($form)
       .append(
       .appendTo($form)
       .append(

-        $('<label>')
-          .attr('for', 'image_filter')
+        $("<label>")
+          .attr("for", "image_filter")

           .append(
           .append(

-            $('<input>')
-              .attr('id', 'image_filter')
-              .attr('type', 'checkbox')
-              .bind('change', toggleFilter))
-          .append(I18n.t('javascripts.share.custom_dimensions')));
-
-    $('<div>')
-      .attr('class', 'form-row')
+            $("<input>")
+              .attr("id", "image_filter")
+              .attr("type", "checkbox")
+              .bind("change", toggleFilter))
+          .append(I18n.t("javascripts.share.custom_dimensions")));
+
+    $("<div>")
+      .attr("class", "form-row")

       .appendTo($form)
       .append(
       .appendTo($form)
       .append(

-        $('<label>')
-          .attr('for', 'mapnik_format')
-          .text(I18n.t('javascripts.share.format')))
-      .append($('<select>')
-        .attr('name', 'mapnik_format')
-        .attr('id', 'mapnik_format')
-        .append($('<option>').val('png').text('PNG').prop('selected', true))
-        .append($('<option>').val('jpeg').text('JPEG'))
-        .append($('<option>').val('svg').text('SVG'))
-        .append($('<option>').val('pdf').text('PDF')));
-
-    $('<div>')
-      .attr('class', 'form-row')
+        $("<label>")
+          .attr("for", "mapnik_format")
+          .text(I18n.t("javascripts.share.format")))
+      .append($("<select>")
+        .attr("name", "mapnik_format")
+        .attr("id", "mapnik_format")
+        .append($("<option>").val("png").text("PNG").prop("selected", true))
+        .append($("<option>").val("jpeg").text("JPEG"))
+        .append($("<option>").val("svg").text("SVG"))
+        .append($("<option>").val("pdf").text("PDF")));
+
+    $("<div>")
+      .attr("class", "form-row")

       .appendTo($form)
       .appendTo($form)

-      .append($('<label>')
-        .attr('for', 'mapnik_scale')
-        .text(I18n.t('javascripts.share.scale')))
-      .append('1 : ')
-      .append($('<input>')
-        .attr('name', 'mapnik_scale')
-        .attr('id', 'mapnik_scale')
-        .attr('type', 'text')
-        .on('change', update));
-
-    ['minlon', 'minlat', 'maxlon', 'maxlat'].forEach(function(name) {
-      $('<input>')
-        .attr('id', 'mapnik_' + name)
-        .attr('name', name)
-        .attr('type', 'hidden')
+      .append($("<label>")
+        .attr("for", "mapnik_scale")
+        .text(I18n.t("javascripts.share.scale")))
+      .append("1 : ")
+      .append($("<input>")
+        .attr("name", "mapnik_scale")
+        .attr("id", "mapnik_scale")
+        .attr("type", "text")
+        .on("change", update));
+
+    ["minlon", "minlat", "maxlon", "maxlat"].forEach(function (name) {
+      $("<input>")
+        .attr("id", "mapnik_" + name)
+        .attr("name", name)
+        .attr("type", "hidden")

         .appendTo($form);
     });
 
         .appendTo($form);
     });
 

-    $('<input>')
-      .attr('name', 'format')
-      .attr('value', 'mapnik')
-      .attr('type', 'hidden')
+    $("<input>")
+      .attr("name", "format")
+      .attr("value", "mapnik")
+      .attr("type", "hidden")
+      .appendTo($form);
+
+    var csrf_param = $("meta[name=csrf-param]").attr("content"),
+        csrf_token = $("meta[name=csrf-token]").attr("content");
+
+    $("<input>")
+      .attr("name", csrf_param)
+      .attr("value", csrf_token)
+      .attr("type", "hidden")

       .appendTo($form);
 
       .appendTo($form);
 

-    $('<p>')
-      .attr('class', 'deemphasize')
-      .html(I18n.t('javascripts.share.image_size') + ' <span id="mapnik_image_width"></span> x <span id="mapnik_image_height"></span>')
+    $("<p>")
+      .attr("class", "deemphasize")
+      .html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")

       .appendTo($form);
 
       .appendTo($form);
 

-    $('<input>')
-      .attr('type', 'submit')
-      .attr('value', I18n.t('javascripts.share.download'))
+    $("<input>")
+      .attr("type", "submit")
+      .attr("value", I18n.t("javascripts.share.download"))

       .appendTo($form);
 
     locationFilter
       .appendTo($form);
 
     locationFilter

-      .on('change', update)
+      .on("change", update)

       .addTo(map);
 
       .addTo(map);
 

-    marker.on('dragend', movedMarker);
-    map.on('move', movedMap);
-    map.on('moveend layeradd layerremove', update);
+    marker.on("dragend", movedMarker);
+    map.on("move", movedMap);
+    map.on("moveend layeradd layerremove", update);

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

-      .on('hide', hidden);
+      .on("hide", hidden);

 
     function hidden() {
       map.removeLayer(marker);
 
     function hidden() {
       map.removeLayer(marker);


@@ -240,19 +256,19 @@ L.OSM.share = function (options) {
       e.stopPropagation();
       e.preventDefault();
 
       e.stopPropagation();
       e.preventDefault();
 

-      $('#mapnik_scale').val(getScale());
+      $("#mapnik_scale").val(getScale());

       marker.setLatLng(map.getCenter());
 
       update();
       options.sidebar.togglePane($ui, button);
       marker.setLatLng(map.getCenter());
 
       update();
       options.sidebar.togglePane($ui, button);

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

     }
 
     function toggleMarker() {
     }
 
     function toggleMarker() {

-      if ($(this).is(':checked')) {
+      if ($(this).is(":checked")) {

         marker.setLatLng(map.getCenter());
         map.addLayer(marker);
         marker.setLatLng(map.getCenter());
         map.addLayer(marker);

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

       } else {
         map.removeLayer(marker);
         map.options.scrollWheelZoom = map.options.doubleClickZoom = true;
       } else {
         map.removeLayer(marker);
         map.options.scrollWheelZoom = map.options.doubleClickZoom = true;


@@ -261,7 +277,7 @@ L.OSM.share = function (options) {
     }
 
     function toggleFilter() {
     }
 
     function toggleFilter() {

-      if ($(this).is(':checked')) {
+      if ($(this).is(":checked")) {

         locationFilter.setBounds(map.getBounds().pad(-0.2));
         locationFilter.enable();
       } else {
         locationFilter.setBounds(map.getBounds().pad(-0.2));
         locationFilter.enable();
       } else {


@@ -277,27 +293,27 @@ L.OSM.share = function (options) {
 
     function movedMarker() {
       if (map.hasLayer(marker)) {
 
     function movedMarker() {
       if (map.hasLayer(marker)) {

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

         map.panTo(marker.getLatLng());
       }
     }
 
     function updateOnce() {
         map.panTo(marker.getLatLng());
       }
     }
 
     function updateOnce() {

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

       update();
     }
 
     function escapeHTML(string) {
       var htmlEscapes = {
       update();
     }
 
     function escapeHTML(string) {
       var htmlEscapes = {

-        '&': '&amp;',
-        '<': '&lt;',
-        '>': '&gt;',
-        '"': '&quot;',
-        "'": '&#x27;'
+        "&": "&amp;",
+        "<": "&lt;",
+        ">": "&gt;",
+        "\"": "&quot;",
+        "'": "&#x27;"

       };
       };

-      return string === null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
+      return string === null ? "" : String(string).replace(/[&<>"']/g, function (match) {

         return htmlEscapes[match];
       });
     }
         return htmlEscapes[match];
       });
     }


@@ -305,18 +321,18 @@ L.OSM.share = function (options) {
     function update() {
       var bounds = map.getBounds();
 
     function update() {
       var bounds = map.getBounds();
 

-      $('#link_marker')
-        .prop('checked', map.hasLayer(marker));
+      $("#link_marker")
+        .prop("checked", map.hasLayer(marker));

 
 

-      $('#image_filter')
-        .prop('checked', locationFilter.isEnabled());
+      $("#image_filter")
+        .prop("checked", locationFilter.isEnabled());

 
       // Link / Embed
 
 
       // Link / Embed
 

-      $('#short_input').val(map.getShortUrl(marker));
-      $('#long_input').val(map.getUrl(marker));
-      $('#short_link').attr('href', map.getShortUrl(marker));
-      $('#long_link').attr('href', map.getUrl(marker));
+      $("#short_input").val(map.getShortUrl(marker));
+      $("#long_input").val(map.getUrl(marker));
+      $("#short_link").attr("href", map.getShortUrl(marker));
+      $("#long_link").attr("href", map.getUrl(marker));

 
       var params = {
         bbox: bounds.toBBoxString(),
 
       var params = {
         bbox: bounds.toBBoxString(),


@@ -325,20 +341,20 @@ L.OSM.share = function (options) {
 
       if (map.hasLayer(marker)) {
         var latLng = marker.getLatLng().wrap();
 
       if (map.hasLayer(marker)) {
         var latLng = marker.getLatLng().wrap();

-        params.marker = latLng.lat + ',' + latLng.lng;
+        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/>' +
-          '<small><a href="' + escapeHTML(map.getUrl(marker)) + '">' +
-          escapeHTML(I18n.t('javascripts.share.view_larger_map')) + '</a></small>');
+      $("#embed_html").val(
+        "<iframe width=\"425\" height=\"350\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\" src=\"" +
+          escapeHTML(OSM.SERVER_PROTOCOL + "://" + OSM.SERVER_URL + "/export/embed.html?" + $.param(params)) +
+          "\" style=\"border: 1px solid black\"></iframe><br/>" +
+          "<small><a href=\"" + escapeHTML(map.getUrl(marker)) + "\">" +
+          escapeHTML(I18n.t("javascripts.share.view_larger_map")) + "</a></small>");

 
       // Geo URI
 
 
       // Geo URI
 

-      $('#geo_uri')
-        .attr('href', map.getGeoUri(marker))
+      $("#geo_uri")
+        .attr("href", map.getGeoUri(marker))

         .html(map.getGeoUri(marker));
 
       // Image
         .html(map.getGeoUri(marker));
 
       // Image


@@ -348,14 +364,14 @@ L.OSM.share = function (options) {
       }
 
       var scale = $("#mapnik_scale").val(),
       }
 
       var scale = $("#mapnik_scale").val(),

-        size = L.bounds(L.CRS.EPSG3857.project(bounds.getSouthWest()),
-                        L.CRS.EPSG3857.project(bounds.getNorthEast())).getSize(),
-        maxScale = Math.floor(Math.sqrt(size.x * size.y / 0.3136));
+          size = L.bounds(L.CRS.EPSG3857.project(bounds.getSouthWest()),
+                          L.CRS.EPSG3857.project(bounds.getNorthEast())).getSize(),
+          maxScale = Math.floor(Math.sqrt(size.x * size.y / 0.3136));

 
 

-      $('#mapnik_minlon').val(bounds.getWest());
-      $('#mapnik_minlat').val(bounds.getSouth());
-      $('#mapnik_maxlon').val(bounds.getEast());
-      $('#mapnik_maxlat').val(bounds.getNorth());
+      $("#mapnik_minlon").val(bounds.getWest());
+      $("#mapnik_minlat").val(bounds.getSouth());
+      $("#mapnik_maxlon").val(bounds.getEast());
+      $("#mapnik_maxlat").val(bounds.getNorth());

 
       if (scale < maxScale) {
         scale = roundScale(maxScale);
 
       if (scale < maxScale) {
         scale = roundScale(maxScale);


@@ -364,6 +380,14 @@ L.OSM.share = function (options) {
 
       $("#mapnik_image_width").text(Math.round(size.x / scale / 0.00028));
       $("#mapnik_image_height").text(Math.round(size.y / scale / 0.00028));
 
       $("#mapnik_image_width").text(Math.round(size.x / scale / 0.00028));
       $("#mapnik_image_height").text(Math.round(size.y / scale / 0.00028));

+
+      if (map.getMapBaseLayerId() === "mapnik") {
+        $("#export-image").show();
+        $("#export-warning").hide();
+      } else {
+        $("#export-image").hide();
+        $("#export-warning").show();
+      }

     }
 
     function select() {
     }
 
     function select() {


@@ -372,11 +396,11 @@ L.OSM.share = function (options) {
 
     function getScale() {
       var bounds = map.getBounds(),
 
     function getScale() {
       var bounds = map.getBounds(),

-        centerLat = bounds.getCenter().lat,
-        halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),
-        meters = halfWorldMeters * (bounds.getEast() - bounds.getWest()) / 180,
-        pixelsPerMeter = map.getSize().x / meters,
-        metersPerPixel = 1 / (92 * 39.3701);
+          centerLat = bounds.getCenter().lat,
+          halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),
+          meters = halfWorldMeters * (bounds.getEast() - bounds.getWest()) / 180,
+          pixelsPerMeter = map.getSize().x / meters,
+          metersPerPixel = 1 / (92 * 39.3701);

       return Math.round(1 / (pixelsPerMeter * metersPerPixel));
     }
 
       return Math.round(1 / (pixelsPerMeter * metersPerPixel));
     }