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

bug 79735, User-overridden browser charset does not propagate into the composer window, r=cmanske, sr=blizzard

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@205451 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
loadrunner%betak.net
2006-07-29 05:37:27 +00:00
parent 14435ab9a7
commit 6f6843ad2b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/suite/common/utilityOverlay.js
View File

@@ -329,6 +329,15 @@ function editPage(url, launchWindow, delay)
}
}
// if the current window is a browser window, then extract the current charset menu setting from the current
// document and use it to initialize the new composer window...
var wintype = document.firstChild.getAttribute('windowtype');
var charsetArg;
if (launchWindow && (wintype == "navigator:browser"))
charsetArg = "charset=" + launchWindow._content.document.characterSet;
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
if (!windowManager) return;
var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
@@ -352,9 +361,9 @@ function editPage(url, launchWindow, delay)
// Create new Composer window
if (delay)
launchWindow.delayedOpenWindow("chrome://editor/content", "chrome,all,dialog=no", url);
launchWindow.delayedOpenWindow("chrome://editor/content", "chrome,all,dialog=no", url, charsetArg);
else
launchWindow.openDialog("chrome://editor/content", "_blank", "chrome,all,dialog=no", url);
launchWindow.openDialog("chrome://editor/content", "_blank", "chrome,all,dialog=no", url, charsetArg);
}
// function that extracts the filename from a url