Merge pull request #5332 from AntonKhorev/layer-preview-backgrounds

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

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
index 2d0d01a6fd1198e7e97ad9b008af2a92b3c3aa0b..706097bbaf2c4f01dcd4bfac7888ce29a11080b0 100644 (file)
--- a/app/assets/javascripts/id.js
+++ b/app/assets/javascripts/id.js
@@ -13,8 +13,10 @@ document.addEventListener("DOMContentLoaded", function () {
   } else {
     var idContext = iD.coreContext();
     idContext.connection().apiConnections([]);
   } else {
     var idContext = iD.coreContext();
     idContext.connection().apiConnections([]);

+    var url = location.protocol + "//" + location.host;

     idContext.preauth({
     idContext.preauth({

-      url: location.protocol + "//" + location.host,
+      url: url,
+      apiUrl: url === "https://www.openstreetmap.org" ? "https://api.openstreetmap.org" : url,

       access_token: container.dataset.token
     });
 
       access_token: container.dataset.token
     });
 


@@ -35,7 +37,7 @@ document.addEventListener("DOMContentLoaded", function () {
       parent.updateLinks(llz, zoom);
 
       // Manually resolve URL to avoid iframe JS context weirdness.
       parent.updateLinks(llz, zoom);
 
       // Manually resolve URL to avoid iframe JS context weirdness.

-      // http://bl.ocks.org/jfirebaugh/5439412
+      // https://gist.github.com/jfirebaugh/5439412

       var hash = parent.OSM.formatHash(llz);
       if (hash !== parent.location.hash) {
         parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash));
       var hash = parent.OSM.formatHash(llz);
       if (hash !== parent.location.hash) {
         parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash));


@@ -47,7 +49,7 @@ document.addEventListener("DOMContentLoaded", function () {
       var data = parent.$(this).data();
 
       // 0ms timeout to avoid iframe JS context weirdness.
       var data = parent.$(this).data();
 
       // 0ms timeout to avoid iframe JS context weirdness.

-      // http://bl.ocks.org/jfirebaugh/5439412
+      // https://gist.github.com/jfirebaugh/5439412

       setTimeout(function () {
         id.map().centerZoom(
           [data.lon, data.lat],
       setTimeout(function () {
         id.map().centerZoom(
           [data.lon, data.lat],