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

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

diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js
index 238d70c5f25c08c71688a9e9c851ba338268d9be..6a3400d348831ab48ff53b5f1a2f9e991307f52b 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -1,21 +1,11 @@
 L.OSM.key = function (options) {
-  var control = L.OSM.sidebarPane(options);
-
-  control.onAdd = function (map) {
-    var $container = $("<div>")
-      .attr("class", "control-key");
-
-    var button = this.makeButton("key", null, toggle)
-      .appendTo($container);
-
-    var $ui = this.makeUI("key-ui", "javascripts.key.title", toggle);
+  var control = L.OSM.sidebarPane(options, "key", null, "javascripts.key.title");
 
+  control.onAddPane = function (map, button, $ui) {
     var $section = $("<div>")
       .attr("class", "section")
       .appendTo($ui);
 
-    options.sidebar.addPane($ui);
-
     $ui
       .on("show", shown)
       .on("hide", hidden);
@@ -33,15 +23,6 @@ L.OSM.key = function (options) {
       map.off("zoomend baselayerchange", update);
     }
 
-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      if (!button.hasClass("disabled")) {
-        options.sidebar.togglePane($ui, button);
-      }
-      $(".leaflet-control .control-button").tooltip("hide");
-    }
-
     function updateButton() {
       var disabled = ["mapnik", "cyclemap"].indexOf(map.getMapBaseLayerId()) === -1;
       button
@@ -65,8 +46,6 @@ L.OSM.key = function (options) {
         }
       });
     }
-
-    return $container[0];
   };
 
   return control;