Update bundle

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

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index d48fd799d2629ca98a6c3ebdb5b6070c0d97b280..e360dcad00dcb891597b438a60eaab36f8092d48 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -18,6 +18,15 @@
 
   function markChanged(a) { changesaved=a; }
 
 
   function markChanged(a) { changesaved=a; }
 

+  function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) {
+    updateLinks({ lon: lon, lat: lat }, zoom);
+
+    var hash = OSM.formatHash({ lon: lon, lat: lat, zoom: zoom });
+    if (hash !== location.hash) {
+      location.replace(hash);
+    }
+  }
+

   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;
 
   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;
 


@@ -42,18 +51,10 @@
     // 700,600 for fixed size, 100%,100% for resizable
   }
 
     // 700,600 for fixed size, 100%,100% for resizable
   }
 

-  <% if @lat && @lon -%>
-  doSWF(<%= @lat %>,<%= @lon %>,16);
-  <% else -%>
-  var params = OSM.mapParams();
-  doSWF(params.lat, params.lon, params.zoom || 17);
-  <% end -%>
-
-  $(document).ready(function () {
-    $("body").on("click", "a.set_position", function () {
-      var data = $(this).data();
-
-      doSWF(data.lat, data.lon, data.zoom || 15);
-    });
-  });
+<% if @lat && @lon -%>
+  doSWF(<%= @lat %>, <%= @lon %>, <%= @zoom %>);
+<% else -%>
+  var mapParams = OSM.mapParams();
+  doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
+<% end -%>

 </script>
 </script>