do not autofill firefox platform/version for searching within other a…

…pplications (bug 715968)
mozilla · Jan 9, 2012 · 807cbb2 · 807cbb2
1 parent ce31237
commit 807cbb2
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 27 deletions.
diff --git a/media/js/impala/search.js b/media/js/impala/search.js
@@ -1,34 +1,38 @@
-$('#search').bind('autofill', function(e) {
-    var $this = $(this);
+function autofillPlatform(context) {
+    var $context = $(context || document.body);
+    $('#search', $context).bind('autofill', function(e) {
+        var $this = $(this);
 
-    // Bail if we're searching within apps.
-    if (!$this.find('#id_appver').length) {
-        return;
-    }
+        // Bail if we're searching within apps.
+        if (!$this.find('#id_appver').length) {
+            return;
+        }
 
-    // Populate search form with browser version and OS.
-    var gv = z.getVars(location.search),
-        appver = '',
-        platform = '',
-        appver_defined = typeof gv.appver !== 'undefined',
-        platform_defined = typeof gv.platform !== 'undefined';
-    if (appver_defined) {
-        appver = gv.appver;
-    }
-    if (platform_defined) {
-        platform = gv.platform;
-    }
-    if (z.browser.firefox) {
-        if (!appver_defined) {
-            appver = z.browserVersion;
+        // Populate search form with browser version and OS.
+        var gv = z.getVars(location.search),
+            appver = '',
+            platform = '',
+            appver_defined = typeof gv.appver !== 'undefined',
+            platform_defined = typeof gv.platform !== 'undefined';
+        if (appver_defined) {
+            appver = gv.appver;
         }
-        if (!platform_defined) {
-            platform = z.platform;
+        if (platform_defined) {
+            platform = gv.platform;
         }
-    }
-    $this.find('#id_appver').val(appver);
-    $this.find('#id_platform').val(platform);
-}).trigger('autofill');
+        if (z.appMatchesUserAgent) {
+            if (!appver_defined) {
+                appver = z.browserVersion;
+            }
+            if (!platform_defined) {
+                platform = z.platform;
+            }
+        }
+        $this.find('#id_appver').val(appver);
+        $this.find('#id_platform').val(platform);
+    }).trigger('autofill');
+}
+autofillPlatform();
 
 
 $(function() {

diff --git a/media/js/zamboni/tests/search_tests.js b/media/js/zamboni/tests/search_tests.js
@@ -1,3 +1,50 @@
+module('Autofill Platform for Search', {
+    setup: function() {
+        this._z = z;
+        this.sandbox = tests.createSandbox('#search-box');
+    },
+    teardown: function() {
+        z = this._z;
+    }
+});
+
+
+test('Firefox using Firefox', function() {
+    z.appMatchesUserAgent = true;
+    z.appName = 'firefox';
+    z.browser.firefox = true;
+    z.browserVersion = '10.0';
+    z.platform = 'mac';
+    autofillPlatform(this.sandbox);
+    equal($('input[name=appver]', this.sandbox).val(), z.browserVersion);
+    equal($('input[name=platform]', this.sandbox).val(), z.platform);
+});
+
+
+test('Thunderbird using Firefox', function() {
+    z.appMatchesUserAgent = false;
+    z.appName = 'thunderbird';
+    z.browser.firefox = true;
+    z.browserVersion = '10.0';
+    z.platform = 'mac';
+    autofillPlatform(this.sandbox);
+    equal($('input[name=appver]', this.sandbox).val(), '');
+    equal($('input[name=platform]', this.sandbox).val(), '');
+});
+
+
+test('Thunderbird using Thunderbird', function() {
+    z.appMatchesUserAgent = true;
+    z.appName = 'thunderbird';
+    z.browser.thunderbird = true;
+    z.browserVersion = '10.0';
+    z.platform = 'mac';
+    autofillPlatform(this.sandbox);
+    equal($('input[name=appver]', this.sandbox).val(), z.browserVersion);
+    equal($('input[name=platform]', this.sandbox).val(), z.platform);
+});
+
+
 module('Pjax Search', {
     setup: function() {
         this.container = $('#pjax-results', this.sandbox);

diff --git a/templates/qunit/qunit.html b/templates/qunit/qunit.html
@@ -237,6 +237,14 @@ <h3>Select a license for your Persona.</h3>
     </form>
   </div>
 
+  <div id="search-box">
+    <form id="search" action="/en-us/firefox/search/">
+      <input type="text" id="search-q" name="q">
+      <input type="hidden" name="appver" id="id_appver">
+      <input type="hidden" name="platform" id="id_platform">
+    </form>
+  </div>
+
   <div id="pjax-search">
     <div id="search-facets">
       <ul class="facets island pjax-trigger"></ul>