autofill? more like overkill (bug 693360)

mozilla · Oct 13, 2011 · 2b1af37 · 2b1af37
1 parent af9dc36
commit 2b1af37
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 12 deletions.
diff --git a/apps/search/forms.py b/apps/search/forms.py
@@ -88,8 +88,6 @@ class SimpleSearchForm(forms.Form):
     """Powers the search box on every page."""
     q = forms.CharField(required=False)
     cat = forms.CharField(required=False, widget=forms.HiddenInput)
-    appver = forms.CharField(required=False, widget=forms.HiddenInput)
-    platform = forms.CharField(required=False, widget=forms.HiddenInput)
     choices = dict(SEARCH_CHOICES)
 
     def clean_cat(self):

diff --git a/apps/search/templates/search/mobile/search.html b/apps/search/templates/search/mobile/search.html
@@ -3,8 +3,6 @@
   <input name="q" placeholder="{{ search_form.placeholder() }}"
          type="search" {% if query %}value="{{ query }}"{% endif %}>
   {{ search_form.cat }}
-  {{ search_form.appver }}
-  {{ search_form.platform }}
   <button type="submit" value="">
     <svg width="22" height="23" xmlns="http://www.w3.org/2000/svg" version="1.1"><polygon fill="#ffffff" points="22,12 11,23 8,20 14,14 0,14 0,10 14,10 8,4 11,1"/></svg>
   </button>

diff --git a/media/js/zamboni/init.js b/media/js/zamboni/init.js
@@ -151,10 +151,6 @@ if (z.browser.firefox) {
     if (z.fxBeta) {
         $(document.body).addClass('fxbeta');
     }
-
-    // Populate search form with browser version and OS.
-    $('#search #id_appver').val(z.browserVersion);
-    $('#search #id_platform').val(z.platform);
 } else {
     z.fxBeta = false;
 }

diff --git a/templates/impala/search.html b/templates/impala/search.html
@@ -5,8 +5,6 @@
          placeholder="{{ search_form.placeholder() }}"
          value="{{ search_form.q.data or '' }}">
   {{ search_form.cat }}
-  {{ search_form.appver }}
-  {{ search_form.platform }}
   <button class="search-button" type="submit" title="{{ _('Search') }}"
          src="{{ media('img/zamboni/global/btn-search.png') }}"></button>
   {% if waffle.switch('search-suggestions') %}

diff --git a/templates/search.html b/templates/search.html
@@ -6,8 +6,6 @@
            placeholder="{{ search_form.placeholder() }}"
            value="{{ search_form.q.data or '' }}">
     {{ search_form.cat }}
-    {{ search_form.appver }}
-    {{ search_form.platform }}
   </span>
   <input id="search-button" type="image" class="submit search-button" title="{{ _('Search') }}"
          src="{{ media('img/zamboni/global/btn-search.png') }}">