From 436665894f8a68edb0ed251f58e1525497f838e9 Mon Sep 17 00:00:00 2001 From: OHTAKE Tomohiro Date: Tue, 4 Oct 2011 23:52:12 +0900 Subject: [PATCH] [FIXED JENKINS-11208] Suggestions for search do not work since 1.433 --- changelog.html | 4 +++- .../main/webapp/scripts/hudson-behavior.js | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/changelog.html b/changelog.html index 0a737ca39d..e8bc05e8dc 100644 --- a/changelog.html +++ b/changelog.html @@ -55,7 +55,9 @@ Upcoming changes diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index b96830be48..27b8f3d737 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -678,11 +678,18 @@ var hudsonRules = { e.parentNode.insertBefore(div,e.nextSibling); e.style.position = "relative"; // or else by default it's absolutely positioned, making "width:100%" break - var ds = new YAHOO.widget.DS_XHR(e.getAttribute("autoCompleteUrl"),["suggestions","name"]); - ds.scriptQueryParam = "value"; + var ds = new YAHOO.util.XHRDataSource(e.getAttribute("autoCompleteUrl")); + ds.responseType = YAHOO.util.XHRDataSource.TYPE_JSON; + ds.responseSchema = { + resultsList: "suggestions", + fields: ["name"] + }; // Instantiate the AutoComplete var ac = new YAHOO.widget.AutoComplete(e, div, ds); + ac.generateRequest = function(query) { + return "?value=" + query; + }; ac.prehighlightClassName = "yui-ac-prehighlight"; ac.animSpeed = 0; ac.useShadow = true; @@ -1725,8 +1732,12 @@ function getStyle(e,a){ // set up logic behind the search box function createSearchBox(searchURL) { - var ds = new YAHOO.widget.DS_XHR(searchURL+"suggest",["suggestions","name"]); - ds.queryMatchCase = false; + var ds = new YAHOO.util.XHRDataSource(searchURL+"suggest"); + ds.responseType = YAHOO.util.XHRDataSource.TYPE_JSON; + ds.responseSchema = { + resultsList: "suggestions", + fields: ["name"] + }; var ac = new YAHOO.widget.AutoComplete("search-box","search-box-completion",ds); ac.typeAhead = false; -- GitLab