Merge globals.js.erb and params.js

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 7d47057b89c2ea26cb080ae8f6903782c4dbe67b..2216a0352c0ea163d42b26377090654217483b06 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,8 +1,15 @@
+//= require index/browse
+//= require index/export
+//= require index/key
+
 $(document).ready(function () {
   var marker;
   var params = OSM.mapParams();
   var map = createMap("map");
 
+  map.events.register("moveend", map, updateLocation);
+  map.events.register("changelayer", map, updateLocation);
+
   if (!params.object_zoom) {
     if (params.bbox) {
       var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
@@ -10,7 +17,7 @@ $(document).ready(function () {
       map.zoomToExtent(proj(bbox));
 
       if (params.box) {
-        $(window).load(function() { addBoxToMap(bbox) });
+        addBoxToMap(bbox);
       }
     } else {
       setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
@@ -32,13 +39,9 @@ $(document).ready(function () {
       url += "/full";
     }
 
-    $(window).load(function() { addObjectToMap(url, params.object_zoom) });
+    addObjectToMap(url, params.object_zoom);
   }
 
-  map.events.register("moveend", map, updateLocation);
-  map.events.register("changelayer", map, updateLocation);
-
-  updateLocation();
   handleResize();
 
   $("#show_data").click(function (e) {
@@ -122,8 +125,22 @@ $(document).ready(function () {
     $("#exportanchor").click();
   }
 
-  var query;
-  if (query = getArgs(window.location.toString()).query) {
-    doSearch(query);
+  $("#search_form").submit(function () {
+    var extent = unproj(map.getExtent());
+
+    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
+    $("#sidebar_content").load($(this).attr("action"), {
+      query: $("#query").val(),
+      minlon: extent.left,
+      minlat: extent.bottom,
+      maxlon: extent.right,
+      maxlat: extent.top
+    }, openSidebar);
+
+    return false;
+  });
+
+  if ($("#query").val()) {
+    $("#search_form").submit();
   }
 });