X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6db326aa1f084a062a3b658876bc01bf650f5702..387ecce798585022ffac69d28ae703c737c36f3b:/app/assets/javascripts/id.js?ds=sidebyside diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js index 0aae749f7..2d0d01a6f 100644 --- a/app/assets/javascripts/id.js +++ b/app/assets/javascripts/id.js @@ -5,30 +5,32 @@ 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([]); + 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, 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; var zoom = ~~id.map().zoom(), - center = id.map().center(), - llz = { lon: center[0], lat: center[1], zoom: zoom }; + center = id.map().center(), + llz = { lon: center[0], lat: center[1], zoom: zoom }; parent.updateLinks(llz, zoom); @@ -52,7 +54,5 @@ document.addEventListener("DOMContentLoaded", function () { Math.max(data.zoom || 15, 13)); }, 0); }); - - id.ui()(container); } });