Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 416668 - Command line handler (-chat) should re-use existing windows

Browse Source 
r=silver@warwickcompsoc.co.uk (James Ross)
p=rdmsoft@bugs.rdmsoft.com (Robert Marshall)
ChatZilla Only. NPOTFFB.


git-svn-id: svn://10.0.0.236/trunk@245375 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gijskruitbosch%gmail.com
2008-02-10 21:54:59 +00:00
parent 1cd9b68646
commit dfe089b869
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/extensions/irc/js/lib/chatzilla-service.js
View File

@@ -160,14 +160,16 @@ function spawnChatZilla(uri, count)
dump("cz-service: Existing, fully loaded window. Using.\n");
// Window is working and initialized ok. Use it.
w.focus();
w.gotoIRCURL(uri);
if (uri)
w.gotoIRCURL(uri);
return true;
}
dump("cz-service: No windows, starting new one.\n");
// Ok, no available window, loading or otherwise, so start ChatZilla.
var args = new Object();
args.url = uri;
if (uri)
args.url = uri;
hiddenWin.ChatZillaStarting = new Date();
hiddenWin.openDialog("chrome://chatzilla/content/chatzilla.xul", "_blank",
@@ -211,28 +213,18 @@ CLineService.prototype.openWindowWithArgs = true;
CLineService.prototype.handle =
function handler_handle(cmdLine)
{
var args;
var uri;
try
{
var uristr = cmdLine.handleFlagWithParam("chat", false);
if (uristr)
{
args = new Object();
args.url = uristr;
}
uri = cmdLine.handleFlagWithParam("chat", false);
}
catch (e)
{
}
if (args || cmdLine.handleFlag("chat", false))
if (uri || cmdLine.handleFlag("chat", false))
{
var assClass = Components.classes[ASS_CONTRACTID];
var ass = assClass.getService(nsIAppShellService);
var hWin = ass.hiddenDOMWindow;
hWin.openDialog("chrome://chatzilla/content/", "_blank",
"chrome,menubar,toolbar,status,resizable,dialog=no",
args);
spawnChatZilla(uri || null)
cmdLine.preventDefault = true;
}
}