X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/56a2aa8efa0b5ed18898f0157a2cc0ca4255a72a..5f0c072ae063cd00d8d2a7323ffb52e066db4dd3:/app/assets/javascripts/leaflet.share.js

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 79cb95973..7b1c995c2 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -1,38 +1,12 @@
 L.OSM.share = function (options) {
-  var control = L.control(options),
+  var control = L.OSM.sidebarPane(options, "share", "javascripts.share.title", "javascripts.share.title"),
       marker = L.marker([0, 0], { draggable: true }),
       locationFilter = new L.LocationFilter({
         enableButton: false,
         adjustButton: false
       });
 
-  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)
-      .appendTo($container);
-
-    var $ui = $("<div>")
-      .attr("class", "share-ui");
-
-    $("<div>")
-      .attr("class", "sidebar_heading")
-      .appendTo($ui)
-      .append(
-        $("<span>")
-          .text(I18n.t("javascripts.close"))
-          .attr("class", "icon close")
-          .bind("click", toggle))
-      .append(
-        $("<h4>")
-          .text(I18n.t("javascripts.share.title")));
-
+  control.onAddPane = function (map, button, $ui) {
     // Link / Embed
 
     var $linkSection = $("<div>")
@@ -47,7 +21,7 @@ L.OSM.share = function (options) {
       .appendTo($linkSection);
 
     $("<div>")
-      .attr("class", "form-check form-group")
+      .attr("class", "form-check mb-3")
       .appendTo($form)
       .append(
         $("<label>")
@@ -61,26 +35,25 @@ L.OSM.share = function (options) {
               .bind("change", toggleMarker))
           .append(I18n.t("javascripts.share.include_marker")));
 
-    $("<div>")
-      .attr("class", "share-tabs")
+    $("<div class='btn-group btn-group-sm mb-2'>")
       .appendTo($form)
-      .append($("<a>")
-        .attr("class", "active")
+      .append($("<a class='btn btn-primary'>")
+        .addClass("active")
         .attr("for", "long_input")
         .attr("id", "long_link")
         .text(I18n.t("javascripts.share.long_link")))
-      .append($("<a>")
+      .append($("<a class='btn btn-primary'>")
         .attr("for", "short_input")
         .attr("id", "short_link")
         .text(I18n.t("javascripts.share.short_link")))
-      .append($("<a>")
+      .append($("<a class='btn btn-primary'>")
         .attr("for", "embed_html")
         .attr("href", "#")
         .text(I18n.t("javascripts.share.embed")))
       .on("click", "a", function (e) {
         e.preventDefault();
         var id = "#" + $(this).attr("for");
-        $linkSection.find(".share-tabs a")
+        $(this).siblings("a")
           .removeClass("active");
         $(this).addClass("active");
         $linkSection.find(".share-tab")
@@ -93,7 +66,6 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
-      .css("display", "block")
       .appendTo($form)
       .append($("<input>")
         .attr("id", "long_input")
@@ -102,6 +74,7 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
+      .hide()
       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")
@@ -110,6 +83,7 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
+      .hide()
       .appendTo($form)
       .append(
         $("<textarea>")
@@ -118,8 +92,7 @@ L.OSM.share = function (options) {
       .append(
         $("<p>")
           .attr("class", "text-muted")
-          .text(I18n.t("javascripts.share.paste_html"))
-          .appendTo($linkSection));
+          .text(I18n.t("javascripts.share.paste_html")));
 
     // Geo URI
 
@@ -159,7 +132,7 @@ L.OSM.share = function (options) {
       .appendTo($imageSection);
 
     $("<div>")
-      .attr("class", "form-group form-check")
+      .attr("class", "mb-3 form-check")
       .appendTo($form)
       .append(
         $("<label>")
@@ -246,11 +219,15 @@ L.OSM.share = function (options) {
     map.on("move", movedMap);
     map.on("moveend layeradd layerremove", update);
 
-    options.sidebar.addPane($ui);
-
     $ui
+      .on("show", shown)
       .on("hide", hidden);
 
+    function shown() {
+      $("#mapnik_scale").val(getScale());
+      update();
+    }
+
     function hidden() {
       map.removeLayer(marker);
       map.options.scrollWheelZoom = map.options.doubleClickZoom = true;
@@ -258,18 +235,6 @@ L.OSM.share = function (options) {
       update();
     }
 
-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
-
-      $("#mapnik_scale").val(getScale());
-      marker.setLatLng(map.getCenter());
-
-      update();
-      options.sidebar.togglePane($ui, button);
-      $(".leaflet-control .control-button").tooltip("hide");
-    }
-
     function toggleMarker() {
       if ($(this).is(":checked")) {
         marker.setLatLng(map.getCenter());
@@ -351,7 +316,7 @@ L.OSM.share = function (options) {
       }
 
       $("#embed_html").val(
-        "<iframe width=\"425\" height=\"350\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\" src=\"" +
+        "<iframe width=\"425\" height=\"350\" 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)) + "\">" +
@@ -414,8 +379,6 @@ L.OSM.share = function (options) {
       var precision = 5 * Math.pow(10, Math.floor(Math.LOG10E * Math.log(scale)) - 2);
       return precision * Math.ceil(scale / precision);
     }
-
-    return $container[0];
   };
 
   return control;