зеркало из https://github.com/mozilla/gecko-dev.git
Bug 323537: add DOMLinkAdded event listener in Startup instead of delayedStartup, since delayedStartup is too late to catch some of the events, r=mconnor
This commit is contained in:
Родитель
1ee0f27693
Коммит
f120eb443d
|
@ -807,6 +807,9 @@ function prepareForStartup()
|
|||
|
||||
// hook up UI through progress listener
|
||||
gBrowser.addProgressListener(window.XULBrowserWindow, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
|
||||
|
||||
// Initialize the feedhandler
|
||||
FeedHandler.init();
|
||||
}
|
||||
|
||||
function delayedStartup()
|
||||
|
@ -968,8 +971,6 @@ function delayedStartup()
|
|||
document.getElementById("textfieldDirection-separator").hidden = false;
|
||||
document.getElementById("textfieldDirection-swap").hidden = false;
|
||||
}
|
||||
|
||||
FeedHandler.init();
|
||||
}
|
||||
|
||||
function BrowserShutdown()
|
||||
|
|
|
@ -157,7 +157,7 @@
|
|||
|
||||
<method name="_initializeEngine">
|
||||
<body><![CDATA[
|
||||
var selectedEngineName;
|
||||
var selectedEngineName = null;
|
||||
try {
|
||||
selectedEngineName =
|
||||
this.prefService
|
||||
|
@ -169,8 +169,7 @@
|
|||
this.currentEngineName = selectedEngineName;
|
||||
|
||||
// check to see whether it failed
|
||||
var engine = this.currentEngine;
|
||||
if (!engine)
|
||||
if (!this.currentEngine)
|
||||
this.currentEngine = this.getDefaultEngine();
|
||||
]]></body>
|
||||
</method>
|
||||
|
@ -250,12 +249,12 @@
|
|||
var name = this.readRDFString(rEngine, kNC_Name);
|
||||
if (name == aName) {
|
||||
this.currentEngine = rEngine.Value;
|
||||
this.parentNode.setAttribute('searchenginename', name);
|
||||
this.parentNode.setAttribute("searchenginename", name);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
this.currentEngine = null;
|
||||
this.parentNode.removeAttribute('searchenginename')
|
||||
this.parentNode.removeAttribute("searchenginename")
|
||||
return false;
|
||||
]]></body>
|
||||
</method>
|
||||
|
|
Загрузка…
Ссылка в новой задаче