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

Bug 66034: Undo work-around put in for this bug, the underlying bug was fixed a while ago. r=alecf, sr=ben.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@211044 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com 2006-09-14 06:02:20 +00:00
parent f725f15ca8
commit 1c23c236eb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/suite/browser/navigator.js
View File

@ -323,9 +323,6 @@ function Startup()
window.browserContentListener =
new nsBrowserContentListener(window, getBrowser());
// XXXjag hack for directory.xul/js
_content.appCore = appCore;
// Initialize browser instance..
appCore.setWebShellWindow(window);
@ -343,10 +340,10 @@ function Startup()
var arrayArgComponents = window.arguments[1].split("=");
if (arrayArgComponents) {
//we should "inherit" the charset menu setting in a new window
appCore.setDefaultCharacterSet(arrayArgComponents[1]); //XXXjag see bug 67442
getMarkupDocumentViewer().defaultCharacterSet = arrayArgComponents[1];
}
} else if (window.arguments[1].indexOf("turbo=yes") != -1) {
turboMode = true;
turboMode = true;
}
}

3
mozilla/suite/browser/viewsource.js
View File

@ -66,7 +66,8 @@ function viewSource(url)
if (window.arguments[1].indexOf('charset=') != -1) {
var arrayArgComponents = window.arguments[1].split('=');
if (arrayArgComponents) {
appCore.setDefaultCharacterSet(arrayArgComponents[1]); //XXXjag see bug 67442
//we should "inherit" the charset menu setting in a new window
getMarkupDocumentViewer().defaultCharacterSet = arrayArgComponents[1];
}
}
}