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

single window mode aviary branch merge. bug 172962, (265962, -266759)

Browse Source
This commit is contained in:
danm-moz%comcast.net 2004-12-07 16:08:38 +00:00
parent 292d92bd2e
commit 18cfa7e94a
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/app/profile/firefox.js
View File

@ -200,8 +200,6 @@ pref("browser.tabs.opentabfor.middleclick", true);
pref("browser.tabs.opentabfor.urlbar", true);
pref("browser.tabs.loadDivertedInBackground", false);
pref("browser.tabs.loadBookmarksInBackground", false);
// XXXben - Hide Single Window mode prefs for 1.0 to avoid crashes (see 266759)
pref("browser.tabs.showSingleWindowModePrefs", true);
// Smart Browsing prefs
pref("browser.related.enabled", true);

6
browser/components/prefwindow/content/pref-advanced.js
View File

@ -76,12 +76,6 @@ function Startup() {
updateWindowLinksBehavior();
parent.hPrefWindow.registerOKCallbackFunc(onOK);
// XXXben - Hide Single Window mode prefs for 1.0 to avoid crashes see 266759
if (parent.hPrefWindow.getPref("bool", "browser.tabs.showSingleWindowModePrefs", false)) {
document.getElementById("tabbedOpenForce").hidden = false;
document.getElementById("tabbedWindowLinks").hidden = false;
}
#ifdef PROVISIONAL_SECURITY_UI
var ocspEntry;
var i;

5
browser/components/prefwindow/content/pref-advanced.xul
View File

@ -49,10 +49,9 @@
<radio label="&recentWindowOrTab.label;" value="1"/>
</radiogroup>
</groupbox>
<!-- XXXben hide single window mode prefs for 1.0 to avoid crashes (see 266759) -->
<checkbox id="tabbedOpenForce" label="&forceNewWindowLinks.label;"
oncommand="updateWindowLinksBehavior()" hidden="true"/>
<radiogroup id="tabbedWindowLinks" hidden="true"
oncommand="updateWindowLinksBehavior()"/>
<radiogroup id="tabbedWindowLinks"
prefstring="browser.link.open_newwindow.ui"
style="margin-left: 23px">
<radio label="&sameTabOrWindow.label;" value="1"/>