Tidy up

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

diff --git a/app/assets/javascripts/index/key.js b/app/assets/javascripts/index/key.js
index 1e4138b70fc7b449b4ba3cae54f5cf8c9b4a93df..9722cf4cf0511f684c95ff7b651a4d06393cf9dd 100644 (file)
--- a/app/assets/javascripts/index/key.js
+++ b/app/assets/javascripts/index/key.js
@@ -1,10 +1,12 @@
 $(document).ready(function () {
   $("#open_map_key").click(function (e) {
 $(document).ready(function () {
   $("#open_map_key").click(function (e) {

+    e.preventDefault();
+

     var url = $(this).attr('href'),
         title = $(this).text();
 
     function updateMapKey() {
     var url = $(this).attr('href'),
         title = $(this).text();
 
     function updateMapKey() {

-      var mapLayer = map.baseLayer.keyid,
+      var mapLayer = getMapBaseLayer().keyid,

           mapZoom = map.getZoom();
 
       $(".mapkey-table-entry").each(function () {
           mapZoom = map.getZoom();
 
       $(".mapkey-table-entry").each(function () {


@@ -24,13 +26,9 @@ $(document).ready(function () {
     openSidebar({ title: title });
 
     $("#sidebar").one("closed", function () {
     openSidebar({ title: title });
 
     $("#sidebar").one("closed", function () {

-      map.events.unregister("zoomend", map, updateMapKey);
-      map.events.unregister("changelayer", map, updateMapKey);
+      map.off("zoomend baselayerchange", updateMapKey);

     });
 
     });
 

-    map.events.register("zoomend", map, updateMapKey);
-    map.events.register("changelayer", map, updateMapKey);
-
-    e.preventDefault();
+    map.on("zoomend baselayerchange", updateMapKey);

   });
 });
   });
 });