mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
192193 - preload popup blocking whitelist. r=danm, sr=jag
This commit is contained in:
parent
25e042cd77
commit
f4df0ea9b4
@ -73,8 +73,41 @@
|
||||
gIconCheckbox = document.getElementById("displayIcon");
|
||||
|
||||
setButtons();
|
||||
|
||||
var prefillWhitelist = (document.getElementById("prefillWhitelist").getAttribute("value") == "true");
|
||||
if (prefillWhitelist) {
|
||||
loadWhitelist();
|
||||
document.getElementById("prefillWhitelist").setAttribute("value", false);
|
||||
}
|
||||
}
|
||||
|
||||
function loadWhitelist() {
|
||||
try {
|
||||
var whitelist;
|
||||
var hosts;
|
||||
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService(Components.interfaces.nsIPrefService);
|
||||
var prefs = prefService.getBranch(null);
|
||||
whitelist = prefs.getComplexValue("privacy.popups.default_whitelist",
|
||||
Components.interfaces.nsIPrefLocalizedString).data;
|
||||
hosts = whitelist.split(",");
|
||||
|
||||
var popupmanager = Components.classes["@mozilla.org/PopupWindowManager;1"]
|
||||
.getService(Components.interfaces.nsIPopupWindowManager);
|
||||
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
.getService(Components.interfaces.nsIIOService);
|
||||
|
||||
for (var i = 0; i < hosts.length; i++) {
|
||||
var host = hosts[i];
|
||||
host = "http://" + host;
|
||||
var uri = ioService.newURI(host, null, null);
|
||||
popupmanager.add(uri, true);
|
||||
}
|
||||
}
|
||||
catch (ex) { }
|
||||
}
|
||||
|
||||
|
||||
function blacklistEmpty() {
|
||||
var permissionmanager = Components.classes["@mozilla.org/permissionmanager;1"]
|
||||
.getService(Components.interfaces.nsIPermissionManager);
|
||||
@ -187,6 +220,7 @@
|
||||
</hbox>
|
||||
<separator class="thin"/>
|
||||
<description>&popupNote.description;</description>
|
||||
<data id="prefillWhitelist" preftype="bool" prefattribute="value" prefstring="privacy.popups.prefill_whitelist"/>
|
||||
</groupbox>
|
||||
|
||||
</page>
|
||||
|
@ -850,3 +850,4 @@ pref("viewmanager.do_doublebuffering", true);
|
||||
pref("privacy.popups.sound_enabled", false);
|
||||
pref("privacy.popups.sound_url", "");
|
||||
pref("privacy.popups.statusbar_icon_enabled", true);
|
||||
pref("privacy.popups.prefill_whitelist", false);
|
||||
|
@ -73,8 +73,41 @@
|
||||
gIconCheckbox = document.getElementById("displayIcon");
|
||||
|
||||
setButtons();
|
||||
|
||||
var prefillWhitelist = (document.getElementById("prefillWhitelist").getAttribute("value") == "true");
|
||||
if (prefillWhitelist) {
|
||||
loadWhitelist();
|
||||
document.getElementById("prefillWhitelist").setAttribute("value", false);
|
||||
}
|
||||
}
|
||||
|
||||
function loadWhitelist() {
|
||||
try {
|
||||
var whitelist;
|
||||
var hosts;
|
||||
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService(Components.interfaces.nsIPrefService);
|
||||
var prefs = prefService.getBranch(null);
|
||||
whitelist = prefs.getComplexValue("privacy.popups.default_whitelist",
|
||||
Components.interfaces.nsIPrefLocalizedString).data;
|
||||
hosts = whitelist.split(",");
|
||||
|
||||
var popupmanager = Components.classes["@mozilla.org/PopupWindowManager;1"]
|
||||
.getService(Components.interfaces.nsIPopupWindowManager);
|
||||
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
.getService(Components.interfaces.nsIIOService);
|
||||
|
||||
for (var i = 0; i < hosts.length; i++) {
|
||||
var host = hosts[i];
|
||||
host = "http://" + host;
|
||||
var uri = ioService.newURI(host, null, null);
|
||||
popupmanager.add(uri, true);
|
||||
}
|
||||
}
|
||||
catch (ex) { }
|
||||
}
|
||||
|
||||
|
||||
function blacklistEmpty() {
|
||||
var permissionmanager = Components.classes["@mozilla.org/permissionmanager;1"]
|
||||
.getService(Components.interfaces.nsIPermissionManager);
|
||||
@ -187,6 +220,7 @@
|
||||
</hbox>
|
||||
<separator class="thin"/>
|
||||
<description>&popupNote.description;</description>
|
||||
<data id="prefillWhitelist" preftype="bool" prefattribute="value" prefstring="privacy.popups.prefill_whitelist"/>
|
||||
</groupbox>
|
||||
|
||||
</page>
|
||||
|
Loading…
Reference in New Issue
Block a user