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

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

diff --git a/app/assets/javascripts/leaflet.sidebar.js b/app/assets/javascripts/leaflet.sidebar.js
index f75cc29fe33f262539b1a12e53726f66cf26f5b4..7e72278e322711e51cd3d538eed0334bbd5ed01f 100644 (file)
--- a/app/assets/javascripts/leaflet.sidebar.js
+++ b/app/assets/javascripts/leaflet.sidebar.js
@@ -1,34 +1,54 @@
-L.OSM.sidebar = function(selector) {
+L.OSM.sidebar = function (selector) {
   var control = {},
-    sidebar = $(selector),
-    current = $();
+      sidebar = $(selector),
+      current = $(),
+      currentButton = $(),
+      map;
 
-  control.addPane = function(pane) {
+  control.addTo = function (_) {
+    map = _;
+    return control;
+  };
+
+  control.addPane = function (pane) {
     pane
       .hide()
       .appendTo(sidebar);
   };
 
-  control.togglePane = function(pane) {
-    var controlContainer = $('.leaflet-control-container .leaflet-top.leaflet-right');
+  control.togglePane = function (pane, button) {
+    var paneWidth = 250;
 
     current
       .hide()
-      .trigger('hide');
+      .trigger("hide");
+
+    currentButton
+      .removeClass("active");
 
     if (current === pane) {
+      if ($("html").attr("dir") === "rtl") {
+        map.panBy([-paneWidth, 0], { animate: false });
+      }
       $(sidebar).hide();
-      controlContainer.css({paddingRight: '0'});
-      current = $();
+      current = currentButton = $();
     } else {
       $(sidebar).show();
-      controlContainer.css({paddingRight: '250px'});
       current = pane;
+      currentButton = button || $();
+      if ($("html").attr("dir") === "rtl") {
+        map.panBy([paneWidth, 0], { animate: false });
+      }
     }
 
+    map.invalidateSize({ pan: false, animate: false });
+
     current
       .show()
-      .trigger('show');
+      .trigger("show");
+
+    currentButton
+      .addClass("active");
   };
 
   return control;