X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3324fd8dd395ab8a54fa04045ee6ad9799337131..a8d8e750dafd173d5f4f6c495fa932e099a6a58c:/app/views/site/id.html.erb?ds=sidebyside diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index 53e177a3f..fde4a07cd 100644 --- a/app/views/site/id.html.erb +++ b/app/views/site/id.html.erb @@ -20,7 +20,8 @@ var id = iD() .embed(true) - .assetPath("/assets/iD/") <%# Can't use asset_path('iD/') in production. %> + .assetPath("/iD/") <%# Can't use asset_path('iD/') in production. %> + .assetMap(<%= assets("iD").to_json.html_safe %>) .locale("<%= locale %>", "<%= asset_path("iD/locales/#{locale}.json") %>") .preauth({ <% token = @user.access_token(ID_KEY) %> @@ -51,7 +52,7 @@ // http://bl.ocks.org/jfirebaugh/5439412 var hash = parent.OSM.formatHash({ lon: center[0], lat: center[1], zoom: zoom }); if (hash !== parent.location.hash) { - parent.location.replace(parent.location.href.replace(/#.*/, hash)); + parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash)); } })); @@ -68,16 +69,6 @@ }, 0); }); - var maximized = false; - id.on('toggleFullscreen.embed', function() { - if (maximized) { - parent.minimiseMap(); - } else { - parent.maximiseMap(); - } - maximized = !maximized; - }); - d3.select('#id-container') .call(id.ui()); }