Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 16:46:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean up -help output. fix bug #26959, make it so when you start

Browse Source 
a browser window, the right page (home, blank or last page visted) gets
loaded.  clean up tasksOverlay.js, navigator.js and Ensure1Window()
use the browser's command line handler (remove duplicate code).
remove uri dispatching ui and js.  r=mscott
This commit is contained in:
sspitzer%netscape.com 2006-09-14 05:47:18 +00:00
parent d99305a2bc
commit 1833ad417a
2 changed files with 18 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
suite/browser/navigator.js
View File

@ -250,57 +250,28 @@ function Shutdown()
appCore.setContentWindow( window.content );
// Have browser app core load appropriate initial page.
/* sspitzer: I think this code is unnecessary, but I'll leave it until I prove it */
/* START OF UNNECESSARY CODE */
if ( !explicitURL ) {
// if all else fails, use trusty "about:blank" as the start page
if (pref) {
// from mozilla/modules/libpref/src/init/all.js
// 0 = blank
// 1 = home (browser.startup.homepage)
// 2 = last
choice = 1;
try {
choice = pref.GetIntPref("browser.startup.page");
}
catch (ex) {
dump("failed to get the browser.startup.page pref\n");
}
dump("browser.startup.page = " + choice + "\n");
switch (choice) {
case 0:
startpage = "about:blank";
break;
case 1:
try {
startpage = pref.CopyCharPref("browser.startup.homepage");
}
catch (ex) {
dump("failed to get the homepage!\n");
startpage = startPageDefault;
}
break;
case 2:
var history = Components.classes['component://netscape/browser/global-history'];
if (history) {
history = history.getService();
}
if (history) {
history = history.QueryInterface(Components.interfaces.nsIGlobalHistory);
}
if (history) {
startpage = history.GetLastPageVisted();
}
break;
default:
startpage = startPageDefault;
}
try {
var handler = Components.classes['component://netscape/appshell/component/browser/cmdhandler'];
handler = handler.getService();
handler = handler.QueryInterface(Components.interfaces.nsICmdLineHandler);
if (handler) {
startpage = handler.defaultArgs;
}
}
else {
dump("failed to QI pref service\n");
}
dump("startpage = " + startpage + "\n");
var args = document.getElementById("args")
catch (ex) {
dump("failed, reason: " + ex + "\n");
startpage = startPageDefault;
}
//dump("startpage = " + startpage + "\n");
var args = document.getElementById("args")
if (args) args.setAttribute("value", startpage);
}
/* END OF UNNECESSARY CODE */
appCore.loadInitialPage();
} else {
// Try again.
@ -1165,23 +1136,3 @@ function dumpMemoryLeaks() {
if (leakDetector != null)
leakDetector.dumpLeaks();
}
function enableUriLoading() {
var pref = Components.classes['component://netscape/preferences'];
if (pref)
{
pref = pref.getService();
pref = pref.QueryInterface(Components.interfaces.nsIPref);
pref.SetDefaultBoolPref("browser.uriloader", true);
}
}
function disableUriLoading() {
var pref = Components.classes['component://netscape/preferences'];
if (pref)
{
pref = pref.getService();
pref = pref.QueryInterface(Components.interfaces.nsIPref);
pref.SetDefaultBoolPref("browser.uriloader", false);
}
}

7
suite/browser/navigatorOverlay.xul
View File

@ -437,13 +437,6 @@ END of Deprecated -->
<!-- TEMPORARY UNTIL -edit WORKS TO STARTUP COMPOSER (bug 16789) -->
<menuitem value="Composer with Test Page" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
<menuseparator />
<menu value="&URIDispatchingCmd.label;">
<menupopup>
<menuitem value="&URIDispatchingEnableCmd.label;" oncommand="enableUriLoading();"/>
<menuitem value="&URIDispatchingDisableCmd.label;" oncommand="disableUriLoading();"/>
</menupopup>
</menu>
</menupopup>
</menu>