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

Work around browser inconsistency in iframe URL resolution

Browse source 
Fixes systemed/iD#1672
This commit is contained in:
John Firebaugh 2013-08-07 14:16:03 -07:00 • committed by Tom Hughes
parent 258e66299a
commit 3324fd8dd3
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/views/site/id.html.erb
View file

@ -47,14 +47,12 @@
[extent[1][1],
extent[1][0]]]);
// 0ms timeout to avoid iframe JS context weirdness.
// Manually resolve URL to avoid iframe JS context weirdness.
// http://bl.ocks.org/jfirebaugh/5439412
parent.setTimeout(function() {
var hash = parent.OSM.formatHash({ lon: center[0], lat: center[1], zoom: zoom });
if (hash !== parent.location.hash) {
parent.location.replace(hash);
}
}, 0);
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.$("body").on("click", "a.set_position", function (e) {
@ -63,7 +61,7 @@
// 0ms timeout to avoid iframe JS context weirdness.
// http://bl.ocks.org/jfirebaugh/5439412
parent.setTimeout(function() {
setTimeout(function() {
id.map().centerZoom(
[data.lon, data.lat],
Math.max(data.zoom || 15, 13));