Build an asset manifest for iD

[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 53e177a3fb90a75f45c903f67bdc8c27820fb0c5..469bb3f91bb06e08cf4f47f3993b3a7e16fe18c3 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -21,6 +21,7 @@
     var id = iD()
       .embed(true)
       .assetPath("/assets/iD/") <%# Can't use asset_path('iD/') in production. %>
+      .assetMap(<%= assets("iD").to_json.html_safe %>)
       .locale("<%= locale %>", "<%= asset_path("iD/locales/#{locale}.json") %>")
       .preauth({
         <% token = @user.access_token(ID_KEY) %>
@@ -51,7 +52,7 @@
       // http://bl.ocks.org/jfirebaugh/5439412
       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.location.replace(parent.location.href.replace(/(#.*|$)/, hash));
       }
     }));
 
@@ -68,16 +69,6 @@
       }, 0);
     });
 
-    var maximized = false;
-    id.on('toggleFullscreen.embed', function() {
-      if (maximized) {
-        parent.minimiseMap();
-      } else {
-        parent.maximiseMap();
-      }
-      maximized = !maximized;
-    });
-
     d3.select('#id-container')
       .call(id.ui());
   }