Set colors for trace visibility badges using .text-bg-*

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

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
index ac18da06f7fd18a5109bb30fef0820eaf0799d0d..706097bbaf2c4f01dcd4bfac7888ce29a11080b0 100644 (file)
--- a/app/assets/javascripts/id.js
+++ b/app/assets/javascripts/id.js
@@ -7,22 +7,24 @@ document.addEventListener("DOMContentLoaded", function () {
 
   if (typeof iD === "undefined" || !iD.utilDetect().support) {
     container.innerHTML = "This editor is supported " +
 
   if (typeof iD === "undefined" || !iD.utilDetect().support) {
     container.innerHTML = "This editor is supported " +

-      "in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. " +
+      "in Firefox, Chrome, Safari, Opera and Edge. " +

       "Please upgrade your browser or use JOSM to edit the map.";
     container.className = "unsupported";
   } else {
       "Please upgrade your browser or use JOSM to edit the map.";
     container.className = "unsupported";
   } else {

-    var id = iD.coreContext()
+    var idContext = iD.coreContext();
+    idContext.connection().apiConnections([]);
+    var url = location.protocol + "//" + location.host;
+    idContext.preauth({
+      url: url,
+      apiUrl: url === "https://www.openstreetmap.org" ? "https://api.openstreetmap.org" : url,
+      access_token: container.dataset.token
+    });
+
+    var id = idContext

       .embed(true)
       .assetPath("iD/")
       .assetMap(JSON.parse(container.dataset.assetMap))
       .locale(container.dataset.locale)
       .embed(true)
       .assetPath("iD/")
       .assetMap(JSON.parse(container.dataset.assetMap))
       .locale(container.dataset.locale)

-      .preauth({
-        urlroot: location.protocol + "//" + location.host,
-        oauth_consumer_key: container.dataset.consumerKey,
-        oauth_secret: container.dataset.consumerSecret,
-        oauth_token: container.dataset.token,
-        oauth_token_secret: container.dataset.tokenSecret
-      })

       .containerNode(container)
       .init();
 
       .containerNode(container)
       .init();
 


@@ -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],