зеркало из https://github.com/mozilla/pjs.git
remove the dialog.start broadcaster/observer r=travis
This commit is contained in:
Родитель
e31c3dcc97
Коммит
fc31bff8a6
|
@ -206,24 +206,6 @@ function Shutdown()
|
|||
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() {
|
||||
// See if load in progress (loading default page).
|
||||
if ( document.getElementById("Browser:Throbber").getAttribute("busy") == "true" ) {
|
||||
|
|
|
@ -69,10 +69,6 @@ Contributor(s): ______________________________________. -->
|
|||
<broadcaster id="args" value=""/>
|
||||
</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 -->
|
||||
<keyset id="keyset"/>
|
||||
|
||||
|
@ -447,7 +443,6 @@ Contributor(s): ______________________________________. -->
|
|||
<spring style="width: 1em"/>
|
||||
<titledbutton id="statusText" class="status-bar" align="left" flex="100%"
|
||||
value="&statusText.label;" style="min-width: 1px">
|
||||
|
||||
<observes element="WebBrowserChrome" attribute="status" onbroadcast="onStatus()"/>
|
||||
<observes element="WebBrowserChrome" attribute="overLink" onbroadcast="onOverLink()"/>
|
||||
<observes element="WebBrowserChrome" attribute="defaultStatus" onbroadcast="onDefaultStatus()"/>
|
||||
|
|
Загрузка…
Ссылка в новой задаче