Merge remote-tracking branch 'osmlab/user-display'

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

diff --git a/app/assets/javascripts/edit.js b/app/assets/javascripts/edit.js
index b9aba25d3fb2bc6e5fd77646cadd7db66861490a..7de65190eb609d6e3db14fac84d237989fc8e31c 100644 (file)
--- a/app/assets/javascripts/edit.js
+++ b/app/assets/javascripts/edit.js
@@ -7,12 +7,25 @@ function minimiseMap() {
 }
 
 $(document).ready(function () {
-  $("#search_form").submit(function () {
+  $("#search_form").submit(function (e) {
+    e.preventDefault();
+
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val()
     }, openSidebar);
+  });
+
+  $("#describe_location").click(function (e) {
+    e.preventDefault();
 
-    return false;
+    var mapParams = OSM.mapParams();
+
+    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
+    $("#sidebar_content").load($(this).attr("href"), {
+      lat: mapParams.lat,
+      lon: mapParams.lon,
+      zoom: mapParams.zoom
+    }, openSidebar);    
   });
 });