Backed out changeset 413f4d055ade (bug 1449338) for ES Linting opt failure in /builds/worker/checkouts/gecko/browser/base/content/contentSearchUI.js on a CLOSED TREE

This commit is contained in:
Noemi Erli 2018-04-19 11:35:30 +03:00
Родитель e3471c9169
Коммит 3ef9e9fbe3
3 изменённых файлов: 0 добавлений и 12 удалений

Просмотреть файл

@ -9,7 +9,6 @@ this.ContentSearchUIController = (function() {
const MAX_DISPLAYED_SUGGESTIONS = 6;
const SUGGESTION_ID_PREFIX = "searchSuggestion";
const ONE_OFF_ID_PREFIX = "oneOff";
const DEFAULT_INPUT_ICON = "chrome://browser/skin/search-glass.svg";
const HTML_NS = "http://www.w3.org/1999/xhtml";
@ -92,7 +91,6 @@ ContentSearchUIController.prototype = {
icon,
};
this._updateDefaultEngineHeader();
this._updateDefaultEngineIcon();
if (engine && document.activeElement == this.input) {
this._speculativeConnect();
@ -611,14 +609,6 @@ ContentSearchUIController.prototype = {
this._strings.searchSettings;
},
_updateDefaultEngineIcon() {
let engine = this._engines.find(engine => engine.name === this.defaultEngine.name);
// We only show the engines icon for default engines, otherwise show
// a default; default engines have an identifier
let icon = engine.identifier ? this.defaultEngine.icon : DEFAULT_INPUT_ICON;
document.body.style.setProperty("--newtab-search-icon", "url(" + icon + ")");
},
_updateDefaultEngineHeader() {
let header = document.getElementById("contentSearchDefaultEngineHeader");
header.firstChild.setAttribute("src", this.defaultEngine.icon);

Просмотреть файл

@ -339,7 +339,6 @@ var ContentSearch = {
name: engine.name,
iconBuffer,
hidden: hiddenList.includes(engine.name),
identifier: engine.identifier
});
}
return state;

Просмотреть файл

@ -372,7 +372,6 @@ var currentStateObj = async function() {
name: engine.name,
iconBuffer: await arrayBufferFromDataURI(uri),
hidden: false,
identifier: engine.identifier,
});
}
return state;