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

Bug 361303 Showing about as a dialog doesn't work in suiterunner. p=Neuos <neuos@technodrome.com>,r=CTho,sr=Neil

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@222468 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%standard8.demon.co.uk
2007-03-27 17:59:10 +00:00
parent 51a60110aa
commit a341a6883e
4 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/suite/browser/browser-prefs.js
View File

@@ -88,9 +88,6 @@ pref("browser.toolbars.showbutton.home", true);
pref("browser.toolbars.showbutton.print", true);
pref("browser.toolbars.showbutton.search", true);
// Dialog modality issues
pref("browser.show_about_as_stupid_modal_window", false);
pref("browser.download.progressDnldDialog.keepAlive", true); // keep the dnload progress dialog up after dnload is complete
pref("browser.download.progressDnldDialog.enable_launch_reveal_buttons", true);
pref("browser.download.progressDnlgDialog.dontAskForLaunch", false);

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

@@ -354,21 +354,33 @@ function openTopWin( url )
return window.openDialog( getBrowserURL(), "_blank", "chrome,all,dialog=no", url );
}
function goAboutDialog()
function goAbout(aProtocol)
{
var defaultAboutState = false;
try {
var pref = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
defaultAboutState = pref.getBoolPref("browser.show_about_as_stupid_modal_window");
const kExistingWindow = Components.interfaces.nsIBrowserDOMWindow.OPEN_CURRENTWINDOW;
const kNewWindow = Components.interfaces.nsIBrowserDOMWindow.OPEN_NEWWINDOW;
var browserWin;
var url = "about:" + (aProtocol || "");
var pref = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
var defaultAboutState = pref.getIntPref("browser.link.open_external");
if (defaultAboutState != kNewWindow)
browserWin = getTopWin();
if (!browserWin)
window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
else {
if (defaultAboutState == kExistingWindow)
browserWin.loadURI(url);
else {
// new tab
var browser = browserWin.getBrowser();
var newTab = browser.addTab(url);
browser.selectedTab = newTab;
}
browserWin.content.focus();
}
catch(e) {
defaultAboutState = false;
}
if( defaultAboutState )
window.openDialog("chrome://global/content/about.xul", "About", "modal,chrome,resizable=yes,height=450,width=550");
else
window.openDialog( getBrowserURL(), "_blank", "chrome,all,dialog=no", 'about:' );
}
function goReleaseNotes()

4
mozilla/suite/common/utilityOverlay.xul
View File

@@ -328,11 +328,11 @@
accesskey="&aboutCommPluginsCmd.accesskey;"
label="&aboutCommPluginsCmd.label;"
id="pluginInfo"
oncommand="openTopWin('about:plugins')"/>
oncommand="goAbout('plugins');"/>
<menuitem accesskey="&aboutCmd.accesskey;"
label="&aboutCmd.label;"
id="aboutName"
oncommand="goAboutDialog();"/>
oncommand="goAbout();"/>
</menupopup>
</menu>

3
mozilla/xpfe/bootstrap/browser-prefs.js
View File

@@ -87,9 +87,6 @@ pref("browser.toolbars.showbutton.home", true);
pref("browser.toolbars.showbutton.print", true);
pref("browser.toolbars.showbutton.search", true);
// Dialog modality issues
pref("browser.show_about_as_stupid_modal_window", false);
pref("browser.download.progressDnldDialog.keepAlive", true); // keep the dnload progress dialog up after dnload is complete
pref("browser.download.progressDnldDialog.enable_launch_reveal_buttons", true);
pref("browser.download.progressDnlgDialog.dontAskForLaunch", false);