]> git.openstreetmap.org Git - rails.git/blobdiff - app/assets/javascripts/id.js
Merge remote-tracking branch 'upstream/pull/4221'
[rails.git] / app / assets / javascripts / id.js
index ac18da06f7fd18a5109bb30fef0820eaf0799d0d..2d0d01a6fd1198e7e97ad9b008af2a92b3c3aa0b 100644 (file)
@@ -7,22 +7,22 @@ document.addEventListener("DOMContentLoaded", function () {
 
   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 {
-    var id = iD.coreContext()
+    var idContext = iD.coreContext();
+    idContext.connection().apiConnections([]);
+    idContext.preauth({
+      url: location.protocol + "//" + location.host,
+      access_token: container.dataset.token
+    });
+
+    var id = idContext
       .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();