Use $(document).ready() to initialise browse JS

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 7d47057b89c2ea26cb080ae8f6903782c4dbe67b..0ceb015a74380a8199fbf4c6c24befab8139dc6c 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,3 +1,7 @@
+//= require index/browse
+//= require index/export
+//= require index/key
+
 $(document).ready(function () {
   var marker;
   var params = OSM.mapParams();
@@ -122,8 +126,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();
   }
 });