зеркало из https://github.com/mozilla/gecko-dev.git
Bug 228103: Toolbar Google search for empty string results in garbage characters.
Loads the host of the search engine when querying for the null string.
This commit is contained in:
Родитель
aab1f96c20
Коммит
da8ef67cf8
|
@ -141,9 +141,19 @@
|
|||
if (this.currentEngine != "__PhoenixFindInPage") {
|
||||
var ISEARCHSVC = Components.classes["@mozilla.org/rdf/datasource;1?name=internetsearch"]
|
||||
.getService(Components.interfaces.nsIInternetSearchService);
|
||||
var searchURL = ISEARCHSVC.GetInternetSearchURL(this.currentEngine, encodeURIComponent(this.value),
|
||||
0, 0, {value:0});
|
||||
gURLBar.value = searchURL;
|
||||
var searchURL = ISEARCHSVC.GetInternetSearchURL(this.currentEngine,
|
||||
this.value? encodeURIComponent(this.value):"",
|
||||
0, 0, {value:0});
|
||||
# if the search box is empty, let''s load the host
|
||||
if (!this.value) {
|
||||
var uri = Components.classes['@mozilla.org/network/standard-url;1']
|
||||
.createInstance(Components.interfaces.nsIURI);
|
||||
uri.spec = searchURL;
|
||||
searchURL = uri.host;
|
||||
if (!searchURL)
|
||||
return;
|
||||
}
|
||||
gURLBar.value = searchURL; //pch: ugly!
|
||||
BrowserLoadURL(this.mEnterEvent); // from autocomplete.xml
|
||||
} else {
|
||||
quickFindInPage(this.value);
|
||||
|
|
Загрузка…
Ссылка в новой задаче