From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 Feb 2017 14:31:56 +0000 (+0000)
Subject: Revert "Update iD frame parameters if the parent URL changes"
X-Git-Tag: live~3565
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/57443546f8395da089ee295cde05750a087fd6dd?hp=a6fa8cc273017c2673d6d76dae7f5ac811c2027d

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

This reverts commit a6fa8cc273017c2673d6d76dae7f5ac811c2027d.
---

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