зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1122493 - reset alias to prevent reappear keywords when restoring default search engines. r=Florian
This commit is contained in:
Родитель
a3030e3cde
Коммит
8be160ee49
|
@ -343,6 +343,11 @@ EngineStore.prototype = {
|
||||||
this.moveEngine(this._getEngineByName(e.name), i);
|
this.moveEngine(this._getEngineByName(e.name), i);
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, add it back to our internal store
|
// Otherwise, add it back to our internal store
|
||||||
|
|
||||||
|
// The search service removes the alias when an engine is hidden,
|
||||||
|
// so clear any alias we may have cached before unhiding the engine.
|
||||||
|
e.alias = "";
|
||||||
|
|
||||||
this._engines.splice(i, 0, e);
|
this._engines.splice(i, 0, e);
|
||||||
let engine = e.originalEngine;
|
let engine = e.originalEngine;
|
||||||
engine.hidden = false;
|
engine.hidden = false;
|
||||||
|
|
|
@ -372,6 +372,11 @@ EngineStore.prototype = {
|
||||||
this.moveEngine(this._getEngineByName(e.name), i);
|
this.moveEngine(this._getEngineByName(e.name), i);
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, add it back to our internal store
|
// Otherwise, add it back to our internal store
|
||||||
|
|
||||||
|
// The search service removes the alias when an engine is hidden,
|
||||||
|
// so clear any alias we may have cached before unhiding the engine.
|
||||||
|
e.alias = "";
|
||||||
|
|
||||||
this._engines.splice(i, 0, e);
|
this._engines.splice(i, 0, e);
|
||||||
this._ops.push(new EngineUnhideOp(e, i));
|
this._ops.push(new EngineUnhideOp(e, i));
|
||||||
added++;
|
added++;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче