Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-10 13:54:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #27646, #40164, #41724 --> removed bogus creation of an extra browser instance which was then registering

Browse Source 
itself as the top level content listener for the original window. This caused lots of bad problems when you tried to create
a new browser window from the task bar from any of the other apps (mail, composer, editor, etc.).

It also fixes URI dispatching which broke because you had mail windows suddenly thinking they were browser windows.
r=jbetak
This commit is contained in:
mscott%netscape.com 2000-06-09 22:47:33 +00:00
parent 625bc7c797
commit 20c1099d9e
1 changed files with 15 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
xpfe/global/resources/content/tasksOverlay.js
View File

@ -110,49 +110,24 @@ function OpenBrowserWindow()
handler = handler.QueryInterface(Components.interfaces.nsICmdLineHandler);
var startpage = handler.defaultArgs;
var url = handler.chromeUrlForTask;
var taskOverlayAppCore = null;
try {
if ((appCore != null) && (taskOverlayAppCore == null)) {
taskOverlayAppCore = appCore;
} else {
CreateTaskOverlayBrowserInstance(taskOverlayAppCore);
}
// if and only if the current window is a browser window and it has a document with a character
// set, then extract the current charset menu setting from the current document and use it to
// initialize the new browser window...
if (window && (window.windowtype == "navigator:browser") && window.content && window.content.document)
{
var DocCharset = window.content.document.characterSet;
charsetArg = "charset="+DocCharset;
dump("*** Current document charset: " + DocCharset + "\n");
//we should "inherit" the charset menu setting in a new window
window.openDialog(url, "_blank", "chrome,all,dialog=no", startpage, charsetArg);
}
catch (ex) {
if (taskOverlayAppCore == null) {
CreateTaskOverlayBrowserInstance(taskOverlayAppCore);
}
else // forget about the charset information.
{
window.openDialog(url, "_blank", "chrome,all,dialog=no", startpage);
}
if (taskOverlayAppCore != null) {
try
{
//let's try to extract the current charset menu setting
var DocCharset = taskOverlayAppCore.GetDocumentCharset();
charsetArg = "charset="+DocCharset;
dump("*** Current document charset: " + DocCharset + "\n");
//we should "inherit" the charset menu setting in a new window
window.openDialog(url, "_blank", "chrome,all,dialog=no", startpage, charsetArg);
}
catch(ex)
{
dump("*** failed to read document charset \n");
}
} else {
//if everythig else fails, forget about the charset
window.openDialog(url, "_blank", "chrome,all,dialog=no", startpage);
}
}
}
function CycleWindow( inType, inChromeURL )
@ -454,30 +429,3 @@ function toImport()
{importType: "addressbook"});
}
function CreateTaskOverlayBrowserInstance(taskOverlayAppCore)
{
//Create browser instance
try {
taskOverlayAppCore = Components
.classes[ "component://netscape/appshell/component/browser/instance" ]
.createInstance( Components.interfaces.nsIBrowserInstance );
}
catch (ex) {
dump( "Error creating browser instance\n" );
return;
}
// now initialize it
try {
taskOverlayAppCore.setWebShellWindow(window);
if ( window.content ) {
dump("Setting content window\n");
taskOverlayAppCore.setContentWindow( window.content );
}
}
catch(ex) {
dump("Failed to create and initialiaze the AppCore...\n");
}
}