Merge remote-tracking branch 'upstream/pull/2890'

[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 69100e4202c3c9a9ccdca6884a4aa95e697a62db..c4a5d026580df296205c3c2bb86799bd292b773e 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -1,10 +1,10 @@
 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) {
     var $container = $("<div>")
 
   control.onAdd = function (map) {
     var $container = $("<div>")


@@ -48,7 +48,7 @@ L.OSM.share = function (options) {
       .appendTo($linkSection);
 
     $("<div>")
       .appendTo($linkSection);
 
     $("<div>")

-      .attr("class", "form-row")
+      .attr("class", "standard-form-row")

       .appendTo($form)
       .append(
         $("<label>")
       .appendTo($form)
       .append(
         $("<label>")


@@ -91,7 +91,7 @@ L.OSM.share = function (options) {
       });
 
     $("<div>")
       });
 
     $("<div>")

-      .attr("class", "form-row share-tab")
+      .attr("class", "standard-form-row share-tab")

       .css("display", "block")
       .appendTo($form)
       .append($("<input>")
       .css("display", "block")
       .appendTo($form)
       .append($("<input>")


@@ -100,7 +100,7 @@ L.OSM.share = function (options) {
         .on("click", select));
 
     $("<div>")
         .on("click", select));
 
     $("<div>")

-      .attr("class", "form-row share-tab")
+      .attr("class", "standard-form-row share-tab")

       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")
       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")


@@ -108,7 +108,7 @@ L.OSM.share = function (options) {
         .on("click", select));
 
     $("<div>")
         .on("click", select));
 
     $("<div>")

-      .attr("class", "form-row share-tab")
+      .attr("class", "standard-form-row share-tab")

       .appendTo($form)
       .append(
         $("<textarea>")
       .appendTo($form)
       .append(
         $("<textarea>")


@@ -116,7 +116,7 @@ L.OSM.share = function (options) {
           .on("click", select))
       .append(
         $("<p>")
           .on("click", select))
       .append(
         $("<p>")

-          .attr("class", "deemphasize")
+          .attr("class", "text-muted")

           .text(I18n.t("javascripts.share.paste_html"))
           .appendTo($linkSection));
 
           .text(I18n.t("javascripts.share.paste_html"))
           .appendTo($linkSection));
 


@@ -147,7 +147,7 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("id", "export-warning")
 
     $("<div>")
       .attr("id", "export-warning")

-      .attr("class", "deemphasize")
+      .attr("class", "text-muted")

       .text(I18n.t("javascripts.share.only_standard_layer"))
       .appendTo($imageSection);
 
       .text(I18n.t("javascripts.share.only_standard_layer"))
       .appendTo($imageSection);
 


@@ -159,7 +159,7 @@ L.OSM.share = function (options) {
       .appendTo($imageSection);
 
     $("<div>")
       .appendTo($imageSection);
 
     $("<div>")

-      .attr("class", "form-row")
+      .attr("class", "standard-form-row")

       .appendTo($form)
       .append(
         $("<label>")
       .appendTo($form)
       .append(
         $("<label>")


@@ -172,7 +172,7 @@ L.OSM.share = function (options) {
           .append(I18n.t("javascripts.share.custom_dimensions")));
 
     $("<div>")
           .append(I18n.t("javascripts.share.custom_dimensions")));
 
     $("<div>")

-      .attr("class", "form-row")
+      .attr("class", "standard-form-row")

       .appendTo($form)
       .append(
         $("<label>")
       .appendTo($form)
       .append(
         $("<label>")


@@ -187,7 +187,7 @@ L.OSM.share = function (options) {
         .append($("<option>").val("pdf").text("PDF")));
 
     $("<div>")
         .append($("<option>").val("pdf").text("PDF")));
 
     $("<div>")

-      .attr("class", "form-row")
+      .attr("class", "standard-form-row")

       .appendTo($form)
       .append($("<label>")
         .attr("for", "mapnik_scale")
       .appendTo($form)
       .append($("<label>")
         .attr("for", "mapnik_scale")


@@ -223,7 +223,7 @@ L.OSM.share = function (options) {
       .appendTo($form);
 
     $("<p>")
       .appendTo($form);
 
     $("<p>")

-      .attr("class", "deemphasize")
+      .attr("class", "text-muted")

       .html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")
       .appendTo($form);
 
       .html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")
       .appendTo($form);
 


@@ -364,9 +364,9 @@ 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_minlon").val(bounds.getWest());
       $("#mapnik_minlat").val(bounds.getSouth());


@@ -396,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));
     }