Ensure URL used for oauth header is absolute

[rails.git] / app / assets / javascripts / application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index fc426e883551b150652133bbba912dd13fd1411a..cb670da340d0feaf2fbead39da4086e643afef02 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -5,6 +5,7 @@
 //= require augment
 //= require leaflet
 //= require leaflet.osm
 //= require augment
 //= require leaflet
 //= require leaflet.osm

+//= require leaflet.zoom

 //= require leaflet.extend
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require leaflet.extend
 //= require leaflet.locationfilter
 //= require i18n/translations


@@ -15,7 +16,6 @@
 //= require menu
 //= require sidebar
 //= require richtext
 //= require menu
 //= require sidebar
 //= require richtext

-//= require resize

 //= require geocoder
 //= require querystring
 
 //= require geocoder
 //= require querystring
 


@@ -99,40 +99,42 @@ function updatelinks(loc, zoom, layers, bounds, object) {
 
     var minzoom = $(link).data("minzoom");
     if (minzoom) {
 
     var minzoom = $(link).data("minzoom");
     if (minzoom) {

-        var name = link.id.replace(/anchor$/, "");
-        $(link).off("click.minzoom");
-        if (zoom >= minzoom) {
-          $(link).attr("title", I18n.t("javascripts.site." + name + "_tooltip"))
-              .removeClass("disabled");
-        } else {
-          $(link).on("click.minzoom", minZoomAlert)
-              .attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip"))
-              .addClass("disabled");
-        }
+      var name = link.id.replace(/anchor$/, "");
+      $(link).off("click.minzoom");
+      if (zoom >= minzoom) {
+        $(link)
+          .attr("title", I18n.t("javascripts.site." + name + "_tooltip"))
+          .removeClass("disabled");
+      } else {
+        $(link)
+          .attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip"))
+          .addClass("disabled")
+          .on("click.minzoom", function () {
+            alert(I18n.t("javascripts.site." + name + "_zoom_alert"));
+            return false;
+          });
+      }

     }
     link.href = base + '?' + querystring.stringify(args);
   }
 }
 
     }
     link.href = base + '?' + querystring.stringify(args);
   }
 }
 

-function minZoomAlert() {
-    alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false;
-}
-

 function getShortUrl(map) {
   return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
 function getShortUrl(map) {
   return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?

-          'http://osm.org/go/' : '/go/') +
+          'http://osm.org/go/' : 'http://' + window.location.hostname + '/go/') +

           makeShortCode(map);
 }
 
 function getUrl(map) {
   var center = map.getCenter(),
           makeShortCode(map);
 }
 
 function getUrl(map) {
   var center = map.getCenter(),

-      zoom = map.getZoom();
+      zoom = map.getZoom(),
+      toZoom = zoomPrecision(zoom);

 
   return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
 
   return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?

-          'http://openstreetmap.org/?' : '/?') +
+          'http://openstreetmap.org/?' : 'http://' + window.location.hostname + '/?') +

         querystring.stringify({
         querystring.stringify({

-            lat: center.lat,
-            lon: center.lng,
+            lat: toZoom(center.lat),
+            lon: toZoom(center.lng),

             zoom: zoom,
             layers: map.getLayersCode()
         });
             zoom: zoom,
             layers: map.getLayersCode()
         });