Merge branch 'master' of https://github.com/openstreetmap/openstreetm…

…ap-website
openstreetmap · Feb 24, 2012 · feae8f2 · feae8f2
2 parents 3f5ba94 + a0cb145
commit feae8f2
Show file tree

Hide file tree

Showing 3 changed files with 2,291 additions and 4 deletions.
diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/site.js
@@ -45,12 +45,13 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
         var minzoom = match[1];
         var name = link.id.replace(/anchor$/, "");
 
+        $(link).off("click.minzoom");
+
         if (zoom >= minzoom) {
-          $(link).off("click");
           $(link).attr("title", i18n("javascripts.site." + name + "_tooltip"));
           $(link).removeClass("disabled");
         } else {
-          $(link).click(function () { alert(i18n("javascripts.site." + name + "_zoom_alert")); return false; });
+          $(link).on("click.minzoom", function () { alert(i18n("javascripts.site." + name + "_zoom_alert")); return false; });
           $(link).attr("title", i18n("javascripts.site." + name + "_disabled_tooltip"));
           $(link).addClass("disabled");
         }

diff --git a/db/.gitignore b/db/.gitignore