wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset c9cf7f0d8a21 (bug 1026568) for bc2 test failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-11-03 10:31:39 +01:00
parent 8525cfed49
commit f1af7abc6d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/base/content/newtab/search.js
View File

@ -213,11 +213,12 @@ let gSearch = {
if (uri) {
this._nodes.logo.style.backgroundImage = "url(" + uri + ")";
this._nodes.text.placeholder = "";
}
else {
this._nodes.logo.style.backgroundImage = "";
this._nodes.text.placeholder = engine.name;
}
this._nodes.text.placeholder = engine.placeholder;
// Set up the suggestion controller.
if (!this._suggestionController) {

4
browser/modules/ContentSearch.jsm
View File

@ -96,7 +96,6 @@ this.ContentSearch = {
addMessageListener(INBOUND_MESSAGE, this);
Services.obs.addObserver(this, "browser-search-engine-modified", false);
Services.obs.addObserver(this, "shutdown-leaks-before-check", false);
this._stringBundle = Services.strings.createBundle("chrome://global/locale/autocomplete.properties");
},
destroy: function () {
@ -392,11 +391,8 @@ this.ContentSearch = {
let favicon = engine.getIconURLBySize(16, 16);
let uri1x = engine.getIconURLBySize(65, 26);
let uri2x = engine.getIconURLBySize(130, 52);
let placeholder = this._stringBundle.formatStringFromName(
"searchWithEngine", [engine.name], 1);
let obj = {
name: engine.name,
placeholder: placeholder,
iconBuffer: yield this._arrayBufferFromDataURI(favicon),
logoBuffer: yield this._arrayBufferFromDataURI(uri1x),
logo2xBuffer: yield this._arrayBufferFromDataURI(uri2x),