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

[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 961842668f25432a3c4905e8df6f8b9a3163fc58..f51aaa72829dfe74e2d26b1705f0372c406d24ec 100644 (file)
--- a/app/assets/javascripts/leaflet.sidebar.js
+++ b/app/assets/javascripts/leaflet.sidebar.js
@@ -1,38 +1,46 @@
-L.OSM.sidebar = function(selector) {
+L.OSM.sidebar = function (selector) {

   var control = {},
   var control = {},

-    sidebar = $(selector),
-    current = $(),
-    map;
+      sidebar = $(selector),
+      current = $(),
+      currentButton = $(),
+      map;

 
   control.addTo = function (_) {
     map = _;
     return control;
   };
 
 
   control.addTo = function (_) {
     map = _;
     return control;
   };
 

-  control.addPane = function(pane) {
+  control.addPane = function (pane) {

     pane
       .hide()
       .appendTo(sidebar);
   };
 
     pane
       .hide()
       .appendTo(sidebar);
   };
 

-  control.togglePane = function(pane) {
+  control.togglePane = function (pane, button) {

     current
       .hide()
     current
       .hide()

-      .trigger('hide');
+      .trigger("hide");
+
+    currentButton
+      .removeClass("active");

 
     if (current === pane) {
       $(sidebar).hide();
 
     if (current === pane) {
       $(sidebar).hide();

-      current = $();
+      current = currentButton = $();

     } else {
       $(sidebar).show();
       current = pane;
     } else {
       $(sidebar).show();
       current = pane;

+      currentButton = button || $();

     }
 
     }
 

+    map.invalidateSize({ pan: false, animate: false });
+

     current
       .show()
     current
       .show()

-      .trigger('show');
+      .trigger("show");

 
 

-    map.invalidateSize({pan: false, animate: false});
+    currentButton
+      .addClass("active");

   };
 
   return control;
   };
 
   return control;