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

[rails.git] / app / assets / javascripts / leaflet.sidebar-pane.js

diff --git a/app/assets/javascripts/leaflet.sidebar-pane.js b/app/assets/javascripts/leaflet.sidebar-pane.js
index fff0b40631931b93f023f162a04e4b2548c2c17e..d8213a3767a948aee2c0a9cdadc5498cbf1d4208 100644 (file)
--- a/app/assets/javascripts/leaflet.sidebar-pane.js
+++ b/app/assets/javascripts/leaflet.sidebar-pane.js
@@ -1,37 +1,52 @@
-L.OSM.sidebarPane = function (options) {
+L.OSM.sidebarPane = function (options, uiClass, buttonTitle, paneTitle) {

   var control = L.control(options);
 
   var control = L.control(options);
 

-  control.makeButton = function (buttonClass, buttonTitle, toggle) {
-    var button =  $("<a>")
+  control.onAdd = function (map) {
+    var $container = $("<div>")
+      .attr("class", "control-" + uiClass);
+
+    var button = $("<a>")

       .attr("class", "control-button")
       .attr("href", "#")
       .attr("class", "control-button")
       .attr("href", "#")

-      .html("<span class=\"icon " + buttonClass + "\"></span>")
+      .html("<span class=\"icon " + uiClass + "\"></span>")

       .on("click", toggle);
       .on("click", toggle);

-    
+

     if (buttonTitle) {
     if (buttonTitle) {

-      button.attr("title", I18n.t(buttonTitle))
+      button.attr("title", I18n.t(buttonTitle));

     }
 
     }
 

-    return button;
-  };
+    button.appendTo($container);

 
 

-  control.makeUI = function (uiClass, paneTitle, toggle) {

     var $ui = $("<div>")
     var $ui = $("<div>")

-      .attr("class", uiClass);
+      .attr("class", uiClass + "-ui");

 
 

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

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

-      .append(
-        $("<button type='button' class='btn-close float-end mt-1'>")
+      .append($("<h4 class='flex-grow-1 text-break'>")
+        .text(I18n.t(paneTitle)))
+      .append($("<div>")
+        .append($("<button type='button' class='btn-close'>")

           .attr("aria-label", I18n.t("javascripts.close"))
           .attr("aria-label", I18n.t("javascripts.close"))

-          .bind("click", toggle))
-      .append(
-        $("<h4>")
-          .text(I18n.t(paneTitle)));
+          .bind("click", toggle)));
+
+    options.sidebar.addPane($ui);

 
 

-    return $ui;
+    this.onAddPane(map, button, $ui, toggle);
+
+    function toggle(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      if (!button.hasClass("disabled")) {
+        options.sidebar.togglePane($ui, button);
+      }
+      $(".leaflet-control .control-button").tooltip("hide");
+    }
+
+    return $container[0];

   };
 
   };
 

+  // control.onAddPane = function (map, button, $ui, toggle) {
+  // }
+

   return control;
 };
   return control;
 };