зеркало из https://github.com/mozilla/pjs.git
remove the dialog.start broadcaster/observer r=travis
This commit is contained in:
Родитель
bb2bdef6b2
Коммит
42f8c3565e
|
@ -206,24 +206,6 @@ function Shutdown()
|
||||||
appCore.close();
|
appCore.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
function onLoadWithArgs() {
|
|
||||||
// See if Startup has been run.
|
|
||||||
if ( appCore ) {
|
|
||||||
// See if load in progress (loading default page).
|
|
||||||
if ( document.getElementById("Browser:Throbber").getAttribute("busy") == "true" ) {
|
|
||||||
dump( "Stopping load of default initial page\n" );
|
|
||||||
appCore.stop();
|
|
||||||
}
|
|
||||||
dump( "Loading page specified on ShowWindowWithArgs\n" );
|
|
||||||
appCore.loadInitialPage();
|
|
||||||
} else {
|
|
||||||
// onLoad handler timing is not correct yet.
|
|
||||||
dump( "onLoadWithArgs not needed yet\n" );
|
|
||||||
// Remember that we want this url.
|
|
||||||
explicitURL = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onLoadViaOpenDialog() {
|
function onLoadViaOpenDialog() {
|
||||||
// See if load in progress (loading default page).
|
// See if load in progress (loading default page).
|
||||||
if ( document.getElementById("Browser:Throbber").getAttribute("busy") == "true" ) {
|
if ( document.getElementById("Browser:Throbber").getAttribute("busy") == "true" ) {
|
||||||
|
|
|
@ -69,10 +69,6 @@ Contributor(s): ______________________________________. -->
|
||||||
<broadcaster id="args" value=""/>
|
<broadcaster id="args" value=""/>
|
||||||
</broadcasterset>
|
</broadcasterset>
|
||||||
|
|
||||||
<!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
|
|
||||||
<broadcaster id="dialog.start" ready="false"/>
|
|
||||||
<observes element="dialog.start" attribute="ready" onbroadcast="onLoadWithArgs()"/>
|
|
||||||
|
|
||||||
<!-- keys are appended from the overlay -->
|
<!-- keys are appended from the overlay -->
|
||||||
<keyset id="keyset"/>
|
<keyset id="keyset"/>
|
||||||
|
|
||||||
|
@ -447,7 +443,6 @@ Contributor(s): ______________________________________. -->
|
||||||
<spring style="width: 1em"/>
|
<spring style="width: 1em"/>
|
||||||
<titledbutton id="statusText" class="status-bar" align="left" flex="100%"
|
<titledbutton id="statusText" class="status-bar" align="left" flex="100%"
|
||||||
value="&statusText.label;" style="min-width: 1px">
|
value="&statusText.label;" style="min-width: 1px">
|
||||||
|
|
||||||
<observes element="WebBrowserChrome" attribute="status" onbroadcast="onStatus()"/>
|
<observes element="WebBrowserChrome" attribute="status" onbroadcast="onStatus()"/>
|
||||||
<observes element="WebBrowserChrome" attribute="overLink" onbroadcast="onOverLink()"/>
|
<observes element="WebBrowserChrome" attribute="overLink" onbroadcast="onOverLink()"/>
|
||||||
<observes element="WebBrowserChrome" attribute="defaultStatus" onbroadcast="onDefaultStatus()"/>
|
<observes element="WebBrowserChrome" attribute="defaultStatus" onbroadcast="onDefaultStatus()"/>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче