Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-07 04:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 55052 (r=nhotta, sr= alecf) search text field changes what user types, and bug 28137 (r=sgehani, sr=alecf, URL search bar should reset category popup

Browse Source
This commit is contained in:
morse%netscape.com 2006-07-27 14:53:19 +00:00
parent 34e1009307
commit 85a86d8510
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
suite/common/search/search-panel.js
View File

@ -44,6 +44,8 @@ var textArc;
var modeArc;
var searchBundle;
var sidebarInitiatedSearch = false;
var RDF_observer =
{
onAssert : function(ds, src, prop, target)
@ -85,12 +87,26 @@ var RDF_observer =
function rememberSearchText(target)
{
if (sidebarInitiatedSearch) {
// this avoids updating the sidebar textfield twice
return;
}
if (target) {
target = target.QueryInterface(nsIRDFLiteral).Value;
if (target) {
// convert plusses (+) back to spaces
target = target.replace(/+/i, " ");
target = target.replace(/+/g, " ");
var textNode = document.getElementById("sidebar-search-text");
if (target != textNode.value) {
// category is unknown, therefore use "All Engines"
var categoryPopup = document.getElementById( "categoryPopup" );
var categoryList = document.getElementById( "categoryList" );
if (categoryPopup && categoryList) {
categoryList.selectedItem = categoryPopup.childNodes[0];
}
}
textNode.value = unescape(target);
doEnabling();
}
@ -203,7 +219,7 @@ function haveSearchResults()
target = target.QueryInterface(nsIRDFLiteral).Value;
if (target) {
// convert plusses (+) back to spaces
target = target.replace(/+/i, " ");
target = target.replace(/+/g, " ");
var textNode = document.getElementById("sidebar-search-text");
textNode.value = unescape(target);
return true;
@ -570,7 +586,9 @@ function OpenSearch(aSearchStr, engineURIs)
var searchDS = Components.classes[ISEARCH_CONTRACTID].getService(nsIInternetSearchService);
var escapedSearchStr = escape(aSearchStr);
sidebarInitiatedSearch = true;
searchDS.RememberLastSearchText(escapedSearchStr);
sidebarInitiatedSearch = false;
var gURL;
try {
@ -674,7 +692,7 @@ function saveSearch()
target = target.QueryInterface(nsIRDFLiteral).Value;
if (target) {
// convert plusses (+) back to spaces
target = target.replace(/+/i, " ");
target = target.replace(/+/g, " ");
lastSearchText = unescape(target);
}
}