From 3cfa98677f31d4a6660c330fa9ec0d5206fb3565 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sun, 1 Aug 2010 17:52:17 -0700
Subject: Bug 578572: Make the user autocomplete and keyword autocomplete
 behave similarly, and fix a race condition in user autocomplete where
 sometimes an older result would appear after a newer result, overriding the
 newer result. r=pyrzak, a=mkanat

---
 js/field.js                                 | 8 ++++----
 skins/standard/global.css                   | 9 ++++++---
 template/en/default/global/header.html.tmpl | 3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/js/field.js b/js/field.js
index d2e800b90..3653d2130 100644
--- a/js/field.js
+++ b/js/field.js
@@ -684,14 +684,13 @@ YAHOO.bugzilla.userAutocomplete = {
     },    
     init_ds : function(){
         this.dataSource = new YAHOO.util.XHRDataSource("jsonrpc.cgi");
+        this.dataSource.connTimeout = 30000;
         this.dataSource.connMethodPost = true;
+        this.dataSource.connXhrMode = "cancelStaleRequests";
+        this.dataSource.maxCacheEntries = 5;
         this.dataSource.responseSchema = {
             resultsList : "result.users",
             metaFields : { error: "error", jsonRpcId: "id"},
-            fields : [
-                { key : "email" },
-                { key : "real_name"}
-            ]
         };    
     },
     init : function( field, container, multiple ) {
@@ -701,6 +700,7 @@ YAHOO.bugzilla.userAutocomplete = {
         var userAutoComp = new YAHOO.widget.AutoComplete( field, container, 
                                 this.dataSource );
         // other stuff we might want to do with the autocomplete goes here
+        userAutoComp.maxResultsDisplayed = BUGZILLA.param.maxusermatches;
         userAutoComp.generateRequest = this.generateRequest;
         userAutoComp.formatResult = this.resultListFormat;
         userAutoComp.doBeforeLoadData = this.debug_helper;
diff --git a/skins/standard/global.css b/skins/standard/global.css
index c5dd62156..4f2709e10 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -518,16 +518,19 @@ input.required, select.required, span.required_explanation {
                               width:auto !important; }
 .yui-skin-sam .yui-ac-container { left:0px !important; }
 .yui-skin-sam .yui-ac { display: inline-block; }
+#bugzilla-body .yui-ac-content {
+    max-height: 19em;
+    overflow: auto;
+    overflow-x: hidden;
+}
 
 #keyword_container {
     padding-bottom: 2em;
     padding-top: .2em;
 }
 
+
 #keyword_container .yui-ac-content {
-    max-height: 19em;
-    overflow: auto;
-    overflow-x: hidden;
     margin-left: -1px;
 }
 
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index a35094793..799f4898f 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -176,7 +176,8 @@
           #%]
         var BUGZILLA = {
             param: {
-                cookiepath: '[% Param('cookiepath') FILTER js %]'
+                cookiepath: '[% Param('cookiepath') FILTER js %]',
+                maxusermatches: [% Param('maxusermatches') FILTER js %]
             },
 
             string: {
-- 
cgit v1.2.3-24-g4f1b