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

Reinstating popup-blocking UI previously removed for the 1.2 release. Removing new privacy.popups preferences. bug 166442 r=brendan,dveditz,jag a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@204789 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
danm%netscape.com 2006-07-27 14:56:48 +00:00
parent 24b6c11aab
commit 3b05a9bbcd
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/suite/common/permissions/permissionsNavigatorOverlay.xul
View File

@ -106,9 +106,7 @@
function SetPopupMenuEnabledState() {
// use care choosing which nsIPopupWindowManager constant to compare
// against. the allow/disallow/sometimes relationship can be subtle.
var useManager = !pref.getBoolPref("dom.disable_open_during_load") &&
pref.getIntPref("privacy.popups.policy") == Components.interfaces.nsIPopupWindowManager.ALLOW_POPUP &&
pref.getBoolPref("privacy.popups.usecustom");
var useManager = !pref.getBoolPref("dom.disable_open_during_load");
var suitable = false;
var enableBlock = false;
if (useManager) {
@ -214,7 +212,6 @@
oncommand="viewImages();"/>
</menupopup>
</menu>
<!--
<menu label="&cookiePopupManager.label;"
accesskey="&cookiePopupManager.accesskey;"
id="popup"
@ -234,6 +231,5 @@
oncommand="viewPopups();"/>
</menupopup>
</menu>
-->
</menupopup>
</overlay>