Pare menu down to basics

[rails.git] / app / views / site / id.html.erb

diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index ccdad95572954100104e5526a5435c68a5154e2b..1b4cdf1bbb778f3bd6a76d27d543ed452c8ca1d9 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -47,14 +47,12 @@
         [extent[1][1],
         extent[1][0]]]);
 
         [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
       // 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) {
     }));
 
     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
 
       // 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));
         id.map().centerZoom(
           [data.lon, data.lat],
           Math.max(data.zoom || 15, 13));