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

Bug 305912: Popup notification bar doesn't appear on first load (e.g. if your homepage tries to open a popup) , and doesn't correctly list all blocked popups, r=mconnor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@179135 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gavin%gavinsharp.com
2005-08-27 17:19:08 +00:00
parent 75f8708f83
commit ab59a7c679
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/browser/base/content/browser.js
View File

@@ -282,7 +282,10 @@ const gPopupBlockerObserver = {
if (gBrowser.selectedBrowser.pageReport) {
this._reportButton.setAttribute("blocked", "true");
if (gPrefService && gPrefService.getBoolPref("privacy.popups.showBrowserMessage")) {
if (!gPrefService)
gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
if (gPrefService.getBoolPref("privacy.popups.showBrowserMessage")) {
var bundle_browser = document.getElementById("bundle_browser");
var brandBundle = document.getElementById("bundle_brand");
var brandShortName = brandBundle.getString("brandShortName");
@@ -786,8 +789,9 @@ function delayedStartup()
os.addObserver(gXPInstallObserver, "xpinstall-install-edit-permissions", false);
os.addObserver(gMissingPluginInstaller, "missing-plugin", false);
gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
if (!gPrefService)
gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
BrowserOffline.init();
if (gURLBar && document.documentElement.getAttribute("chromehidden").indexOf("toolbar") != -1) {

2
mozilla/toolkit/content/widgets/browser.xml
View File

@@ -468,13 +468,13 @@
<![CDATA[
if (!this.pageReport) {
this.pageReport = new Array();
this.updatePageReport();
}
var obj = { requestingWindowURI: evt.requestingWindowURI,
popupWindowURI: evt.popupWindowURI,
popupWindowFeatures: evt.popupWindowFeatures };
this.pageReport.push(obj);
this.updatePageReport()
]]>
</body>
</method>