Merge remote-tracking branch 'upstream/pull/3702'

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

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
index 889a39f864a80aba8061bfa8787b66e2c95dd138..88b628e67d56bdae2a10a16820218b1458513876 100644 (file)
--- a/app/assets/javascripts/id.js
+++ b/app/assets/javascripts/id.js
@@ -7,8 +7,8 @@ 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. " +
-      "Please upgrade your browser or use Potlatch 2 to edit the map.";
+      "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()
     container.className = "unsupported";
   } else {
     var id = iD.coreContext()


@@ -17,11 +17,8 @@ document.addEventListener("DOMContentLoaded", function () {
       .assetMap(JSON.parse(container.dataset.assetMap))
       .locale(container.dataset.locale)
       .preauth({
       .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
+        url: location.protocol + "//" + location.host,
+        access_token: container.dataset.token

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