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 30823d49ea5d00a0a493463c4aa6f1046b6c4433..7de65190eb609d6e3db14fac84d237989fc8e31c 100644 (file)
--- a/app/assets/javascripts/edit.js
+++ b/app/assets/javascripts/edit.js
@@ -1,41 +1,31 @@
 function maximiseMap() {
-  $("#left").hide();
-  $("#top-bar").hide();
-
-  $("#content").css("top", "0px");
-  if ($("html").attr("dir") == "ltr") {
-    $("#content").css("margin-left", "0px");
-  } else {
-    $("#content").css("margin-right", "0px");
-  }
-
-  handleResize();
+  $("#content").addClass("maximised");
 }
 
 function minimiseMap() {
-  $("#left").show();
-  $("#top-bar").show();
-
-  $("#content").css("top", "30px");
-  if ($("html").attr("dir") == "ltr") {
-    $("#content").css("margin-left", "185px");
-  } else {
-    $("#content").css("margin-right", "185px");
-  }
-
-  handleResize();
+  $("#content").removeClass("maximised");
 }
 
 $(document).ready(function () {
-  $(window).resize(handleResize);
-  handleResize();
+  $("#search_form").submit(function (e) {
+    e.preventDefault();
 
-  $("#search_form").submit(function () {
     $("#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);    
   });
 });