X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e3d5e3da52ffdf10445f2d9cdcc8c67633f2dd82..483854f411ce7106144883824adb7e49060424c2:/app/assets/javascripts/application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c52c072a7..7e9584d09 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,18 +1,24 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery.autogrowtextarea
 //= require jquery.timers
 //= require jquery.cookie
 //= require augment
-//= require openlayers
+//= require leaflet
+//= require leaflet.osm
+//= require leaflet.locationfilter
+//= require leaflet.locate
+//= require leaflet.note
 //= require i18n/translations
+//= require oauth
 //= require osm
 //= require piwik
 //= require map
 //= require menu
 //= require sidebar
+//= require leaflet.share
 //= require richtext
 //= require resize
+//= require geocoder
 
 function zoomPrecision(zoom) {
     var decimals = Math.pow(10, Math.floor(zoom/3));
@@ -25,12 +31,12 @@ function zoomPrecision(zoom) {
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links
  */
-function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) {
+function updatelinks(loc, zoom, layers, minlon, minlat, maxlon, maxlat, object) {
   var toPrecision = zoomPrecision(zoom);
   var node;
 
-  lat = toPrecision(lat);
-  lon = toPrecision(lon);
+  var lat = toPrecision(loc.lat),
+      lon = toPrecision(loc.lon || loc.lng);
 
   if (minlon) {
     minlon = toPrecision(minlon);
@@ -39,7 +45,10 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) {
     maxlat = toPrecision(maxlat);
   }
 
-  $(".geolink").each(function (index, link) {
+  $(".geolink").each(setGeolink);
+  $("#shortlinkanchor").each(setShortlink);
+
+  function setGeolink(index, link) {
     var args = getArgs(link.href);
 
     if ($(link).hasClass("llz")) {
@@ -65,19 +74,23 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) {
         $(link).off("click.minzoom");
 
         if (zoom >= minzoom) {
-          $(link).attr("title", I18n.t("javascripts.site." + name + "_tooltip"));
-          $(link).removeClass("disabled");
+          $(link).attr("title", I18n.t("javascripts.site." + name + "_tooltip"))
+              .removeClass("disabled");
         } else {
-          $(link).on("click.minzoom", function () { alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false; });
-          $(link).attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip"));
-          $(link).addClass("disabled");
+          $(link).on("click.minzoom", minZoomAlert)
+              .attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip"))
+              .addClass("disabled");
         }
     }
 
     link.href = setArgs(link.href, args);
-  });
+  }
 
-  $("#shortlinkanchor").each(function () {
+  function minZoomAlert() {
+      alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false;
+  }
+
+  function setShortlink() {
     var args = getArgs(this.href);
     var code = makeShortCode(lat, lon, zoom);
     var prefix = shortlinkPrefix();
@@ -104,7 +117,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) {
     } else {
       this.href = prefix + "/go/" + code;
     }
-  });
+  }
 }
 
 /*
@@ -210,10 +223,3 @@ $(document).ready(function () {
   var auth_token = $("meta[name=csrf-token]").attr("content");
   $("form input[name=authenticity_token]").val(auth_token);
 });
-
-/*
- * Enable auto expansion for all text areas
- */
-$(document).ready(function () {
-  $("textarea").autoGrow();
-});