зеркало из https://github.com/mozilla/gecko-dev.git
fix for bug #244279
Enabling popup blocking from About Popups fails to set the preference. thanks to neil for the fix. r=mconnor, sr=dveditz
This commit is contained in:
Родитель
620d3608b2
Коммит
00e602f3a4
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
id="popupsPanel"
|
id="popupsPanel"
|
||||||
onload="init()"
|
onload="parent.initPanel('chrome://cookie/content/pref-popups.xul');"
|
||||||
headertitle="&title;">
|
headertitle="&title;">
|
||||||
|
|
||||||
<script type="application/x-javascript">
|
<script type="application/x-javascript">
|
||||||
|
@ -66,9 +66,7 @@
|
||||||
var permissionManager;
|
var permissionManager;
|
||||||
var ioService;
|
var ioService;
|
||||||
|
|
||||||
function init() {
|
function Startup() {
|
||||||
parent.initPanel("chrome://cookie/content/pref-popups.xul");
|
|
||||||
|
|
||||||
permissionManager = Components.classes["@mozilla.org/permissionmanager;1"]
|
permissionManager = Components.classes["@mozilla.org/permissionmanager;1"]
|
||||||
.getService(Components.interfaces.nsIPermissionManager);
|
.getService(Components.interfaces.nsIPermissionManager);
|
||||||
|
|
||||||
|
@ -94,8 +92,11 @@
|
||||||
document.getElementById("prefillWhitelist").setAttribute("value", false);
|
document.getElementById("prefillWhitelist").setAttribute("value", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!parent.window.opener.location) // opened from About Popups menuitem
|
if (parent.queuedTag == "chrome://cookie/content/pref-popups.xul") {
|
||||||
|
// opened from About Popups menuitem
|
||||||
gPolicyCheckbox.checked = true;
|
gPolicyCheckbox.checked = true;
|
||||||
|
parent.queuedTag = null;
|
||||||
|
}
|
||||||
|
|
||||||
setButtons();
|
setButtons();
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче