From: Tom Hughes <tom@compton.nu>
Date: Sun, 22 May 2011 10:08:17 +0000 (+0100)
Subject: Only add bbox data to the search form while we submit it
X-Git-Tag: live~6290^2~5
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7014cdb32cf0024e169204da49486048f08b1ca2

Only add bbox data to the search form while we submit it

Having the bbox attributes on the search form all the time means
that Firefox will incude them in the arguments if you bookmark the
search using "Add a keyword for this search" on the context menu.
---

diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb
index f487e8f4a..8c5bd8b80 100644
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -1,9 +1,5 @@
 <script type="text/javascript">
 <!--
-  function startSearch() {
-    updateSidebar("<%= t 'site.sidebar.search_results' %>", "");
-  }
-
   function describeLocation() {
     var args = getArgs($("viewanchor").href);
 
@@ -16,10 +12,46 @@
     <% if params[:action] == 'index' %>
     var extent = getMapExtent();
 
-    $("minlon").value = extent.left;
-    $("minlat").value = extent.bottom;
-    $("maxlon").value = extent.right;
-    $("maxlat").value = extent.top;
+    var minlon = document.createElement("input");
+    minlon.type = "hidden";
+    minlon.id = "minlon";
+    minlon.name = "minlon";
+    minlon.value = extent.left;
+    $("search_form").appendChild(minlon);
+
+    var minlat = document.createElement("input");
+    minlat.type = "hidden";
+    minlat.id = "minlat";
+    minlat.name = "minlat";
+    minlat.value = extent.bottom;
+    $("search_form").appendChild(minlat);
+
+    var maxlon = document.createElement("input");
+    maxlon.type = "hidden";
+    maxlon.id = "maxlon";
+    maxlon.name = "maxlon";
+    maxlon.value = extent.left;
+    $("search_form").appendChild(maxlon);
+
+    var maxlat = document.createElement("input");
+    maxlat.type = "hidden";
+    maxlat.id = "maxlat";
+    maxlat.name = "maxlat";
+    maxlat.value = extent.bottom;
+    $("search_form").appendChild(maxlat);
+    <% end %>
+  }
+
+  function startSearch() {
+    updateSidebar("<%= t 'site.sidebar.search_results' %>", "");
+  }
+
+  function endSearch() {
+    <% if params[:action] == 'index' %>
+    $("minlon").remove();
+    $("minlat").remove();
+    $("maxlon").remove();
+    $("maxlat").remove();
     <% end %>
   }
 
@@ -34,20 +66,14 @@
   <div class="optionalbox">
     <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>
     <h1><%= t 'site.search.search' %></h1>
-    <div class="search_form">
+    <div class="search_container">
     <div id="search_field">
     <% form_remote_tag(:before => "setSearchViewbox()",
                        :loading => "startSearch()",
                        :complete => "endSearch()",
                        :url => { :controller => :geocoder, :action => :search },
-                       :html => { :method => "get", :action => url_for(:action => "index") }) do %>
+                       :html => { :id => "search_form", :method => "get", :action => url_for(:action => "index") }) do %>
       <%= text_field_tag :query, h(params[:query]), :tabindex => "1" %>
-      <% if params[:action] == 'index' %>
-        <%= hidden_field_tag :minlon %>
-        <%= hidden_field_tag :minlat %>
-        <%= hidden_field_tag :maxlon %>
-        <%= hidden_field_tag :maxlat %>
-      <% end %>
       <%= submit_tag t('site.search.submit_text') %>
     <% end %>
     </div>
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 1ea7a5bd2..a62665e34 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -222,7 +222,7 @@ hr {
   float: right;
 }
 
-.search_form {
+.search_container {
   height: 16px;
   padding-bottom: 6px;
 }