Merge pull request #4107 from tomhughes/diary-visibility

[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 c4a5d026580df296205c3c2bb86799bd292b773e..7b1c995c2d1a45fe03cc6fe9e6fe3dffcd13f620 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -1,38 +1,12 @@
 L.OSM.share = function (options) {
 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
       });
 
       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>")
     // Link / Embed
 
     var $linkSection = $("<div>")


@@ -44,42 +18,42 @@ L.OSM.share = function (options) {
       .appendTo($linkSection);
 
     var $form = $("<form>")
       .appendTo($linkSection);
 
     var $form = $("<form>")

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

       .appendTo($linkSection);
 
     $("<div>")
       .appendTo($linkSection);
 
     $("<div>")

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

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

+          .attr("class", "form-check-label")

           .append(
             $("<input>")
               .attr("id", "link_marker")
               .attr("type", "checkbox")
           .append(
             $("<input>")
               .attr("id", "link_marker")
               .attr("type", "checkbox")

+              .attr("class", "form-check-input")

               .bind("change", toggleMarker))
           .append(I18n.t("javascripts.share.include_marker")));
 
               .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)
       .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")))
         .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")))
         .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");
         .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")
           .removeClass("active");
         $(this).addClass("active");
         $linkSection.find(".share-tab")


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

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

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


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

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

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


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

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

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


@@ -117,8 +92,7 @@ L.OSM.share = function (options) {
       .append(
         $("<p>")
           .attr("class", "text-muted")
       .append(
         $("<p>")
           .attr("class", "text-muted")

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

 
     // Geo URI
 
 
     // Geo URI
 


@@ -153,26 +127,26 @@ L.OSM.share = function (options) {
 
     $form = $("<form>")
       .attr("id", "export-image")
 
     $form = $("<form>")
       .attr("id", "export-image")

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

       .attr("action", "/export/finish")
       .attr("method", "post")
       .appendTo($imageSection);
 
     $("<div>")
       .attr("action", "/export/finish")
       .attr("method", "post")
       .appendTo($imageSection);
 
     $("<div>")

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

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

+          .attr("class", "form-check-label")

           .append(
             $("<input>")
               .attr("id", "image_filter")
               .attr("type", "checkbox")
           .append(
             $("<input>")
               .attr("id", "image_filter")
               .attr("type", "checkbox")

+              .attr("class", "form-check-input")

               .bind("change", toggleFilter))
           .append(I18n.t("javascripts.share.custom_dimensions")));
 
     $("<div>")
               .bind("change", toggleFilter))
           .append(I18n.t("javascripts.share.custom_dimensions")));
 
     $("<div>")

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

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


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

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

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


@@ -222,13 +195,19 @@ L.OSM.share = function (options) {
       .attr("type", "hidden")
       .appendTo($form);
 
       .attr("type", "hidden")
       .appendTo($form);
 

+    var args = {
+      width: "<span id=\"mapnik_image_width\"></span>",
+      height: "<span id=\"mapnik_image_height\"></span>"
+    };
+

     $("<p>")
       .attr("class", "text-muted")
     $("<p>")
       .attr("class", "text-muted")

-      .html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")
+      .html(I18n.t("javascripts.share.image_dimensions", args))

       .appendTo($form);
 
     $("<input>")
       .attr("type", "submit")
       .appendTo($form);
 
     $("<input>")
       .attr("type", "submit")

+      .attr("class", "btn btn-primary")

       .attr("value", I18n.t("javascripts.share.download"))
       .appendTo($form);
 
       .attr("value", I18n.t("javascripts.share.download"))
       .appendTo($form);
 


@@ -240,11 +219,15 @@ L.OSM.share = function (options) {
     map.on("move", movedMap);
     map.on("moveend layeradd layerremove", update);
 
     map.on("move", movedMap);
     map.on("moveend layeradd layerremove", update);
 

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

     $ui
     $ui

+      .on("show", shown)

       .on("hide", hidden);
 
       .on("hide", hidden);
 

+    function shown() {
+      $("#mapnik_scale").val(getScale());
+      update();
+    }
+

     function hidden() {
       map.removeLayer(marker);
       map.options.scrollWheelZoom = map.options.doubleClickZoom = true;
     function hidden() {
       map.removeLayer(marker);
       map.options.scrollWheelZoom = map.options.doubleClickZoom = true;


@@ -252,18 +235,6 @@ L.OSM.share = function (options) {
       update();
     }
 
       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());
     function toggleMarker() {
       if ($(this).is(":checked")) {
         marker.setLatLng(map.getCenter());


@@ -345,7 +316,7 @@ L.OSM.share = function (options) {
       }
 
       $("#embed_html").val(
       }
 
       $("#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)) + "\">" +
           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)) + "\">" +


@@ -408,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);
     }
       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;
   };
 
   return control;