Merge remote-tracking branch 'upstream/pull/5420'

[rails.git] / app / assets / javascripts / id.js

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
index 706097bbaf2c4f01dcd4bfac7888ce29a11080b0..15f77b1c14dda0d3542b40979d1987cdd8e13e98 100644 (file)
--- a/app/assets/javascripts/id.js
+++ b/app/assets/javascripts/id.js
@@ -28,6 +28,12 @@ document.addEventListener("DOMContentLoaded", function () {
       .containerNode(container)
       .init();
 
       .containerNode(container)
       .init();
 

+    if (parent === window) {
+      // iD not opened in an iframe -> skip setting of parent  handlers
+      return;
+    }
+
+    var hashChangedAutomatically = false;

     id.map().on("move.embed", parent.$.throttle(250, function () {
       if (id.inIntro()) return;
       var zoom = ~~id.map().zoom(),
     id.map().on("move.embed", parent.$.throttle(250, function () {
       if (id.inIntro()) return;
       var zoom = ~~id.map().zoom(),


@@ -40,14 +46,12 @@ document.addEventListener("DOMContentLoaded", function () {
       // https://gist.github.com/jfirebaugh/5439412
       var hash = parent.OSM.formatHash(llz);
       if (hash !== parent.location.hash) {
       // https://gist.github.com/jfirebaugh/5439412
       var hash = parent.OSM.formatHash(llz);
       if (hash !== parent.location.hash) {

+        hashChangedAutomatically = true;

         parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash));
       }
     }));
 
         parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash));
       }
     }));
 

-    parent.$("body").on("click", "a.set_position", function (e) {
-      e.preventDefault();
-      var data = parent.$(this).data();
-
+    function goToLocation(data) {

       // 0ms timeout to avoid iframe JS context weirdness.
       // https://gist.github.com/jfirebaugh/5439412
       setTimeout(function () {
       // 0ms timeout to avoid iframe JS context weirdness.
       // https://gist.github.com/jfirebaugh/5439412
       setTimeout(function () {


@@ -55,6 +59,22 @@ document.addEventListener("DOMContentLoaded", function () {
           [data.lon, data.lat],
           Math.max(data.zoom || 15, 13));
       }, 0);
           [data.lon, data.lat],
           Math.max(data.zoom || 15, 13));
       }, 0);

+    }
+
+    parent.$("body").on("click", "a.set_position", function (e) {
+      e.preventDefault();
+      var data = parent.$(this).data();
+      goToLocation(data);
+    });
+
+    parent.addEventListener("hashchange", function (e) {
+      if (hashChangedAutomatically) {
+        hashChangedAutomatically = false;
+        return;
+      }
+      e.preventDefault();
+      var data = parent.OSM.mapParams();
+      goToLocation(data);

     });
   }
 });
     });
   }
 });