cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Update iD frame parameters if the parent URL changes"

Browse source 
This reverts commit a6fa8cc273.
This commit is contained in:
Tom Hughes 2017-02-27 14:31:56 +00:00
parent a6fa8cc273
commit 57443546f8
1 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
app/views/site/_id.html.erb
View file

@ -5,24 +5,20 @@
<script> <script>
var params = {}; var params = {};
function getParams(params) { var mapParams = OSM.mapParams();
var mapParams = OSM.mapParams(); if (mapParams.object) {
if (mapParams.object) { params.id = mapParams.object.type[0] + mapParams.object.id;
params.id = mapParams.object.type[0] + mapParams.object.id; mapParams = OSM.parseHash(location.hash);
mapParams = OSM.parseHash(location.hash); if (mapParams.center) {
if (mapParams.center) { params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lng;
params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lng;
}
} else {
params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
} }
} } else {
getParams(params);
<% if @lat && @lon -%> <% if @lat && @lon -%>
params.map = '16/<%= @lat %>/<%= @lon %>'; params.map = '16/<%= @lat %>/<%= @lon %>';
<% else -%>
params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
<% end -%> <% end -%>
}
var hashParams = OSM.params(location.hash.substring(1)); var hashParams = OSM.params(location.hash.substring(1));
@ -44,14 +40,7 @@
} }
<% end -%> <% end -%>
var baseUrl = '<%= id_url :locale => params[:locale] %>#'; $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>#' + querystring.stringify(params));
$('#id-embed').attr('src', baseUrl + querystring.stringify(params));
$(window).on('hashchange', function () {
getParams(params);
$('#id-embed').attr('src', baseUrl + querystring.stringify(params));
});
</script> </script>
<% else %> <% else %>
<script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script> <script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>