X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c162c065c6f6db5dc584599f5639b296b627a165..2f222c49dd60ea505f2c1631efa02fbd9f0f5667:/app/assets/javascripts/id.js diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js index ba16d9df2..8c0a061dd 100644 --- a/app/assets/javascripts/id.js +++ b/app/assets/javascripts/id.js @@ -5,24 +5,28 @@ document.addEventListener("DOMContentLoaded", function () { var container = document.getElementById("id-container"); - if (typeof iD === "undefined" || !iD.Detect().support) { + 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.Context() + 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, container.dataset.localePath) - .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 - }); + .locale(container.dataset.locale) + .containerNode(container) + .init(); id.map().on("move.embed", parent.$.throttle(250, function () { if (id.inIntro()) return; @@ -52,7 +56,5 @@ document.addEventListener("DOMContentLoaded", function () { Math.max(data.zoom || 15, 13)); }, 0); }); - - id.ui()(container); } });