mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
Remove popups pref panel.
This commit is contained in:
parent
3e5daddf3f
commit
44f0b8d975
@ -33,10 +33,16 @@
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["advancedJavaAllow", "advancedMailFTP", "advancedMailFTPAddress", "useProgressDialogs",
|
||||
"imageLooping"];
|
||||
"popupPolicy"];
|
||||
|
||||
var policyButton;
|
||||
var manageTree;
|
||||
function Startup() {
|
||||
ftpCheck();
|
||||
policyButton = document.getElementById("popupPolicy");
|
||||
manageTree = document.getElementById("permissionsTree");
|
||||
toggleEnabling();
|
||||
|
||||
}
|
||||
function ftpCheck() {
|
||||
var checked = document.getElementById("advancedMailFTP").checked;
|
||||
@ -45,6 +51,233 @@
|
||||
if (checked)
|
||||
field.focus();
|
||||
}
|
||||
|
||||
function toggleEnabling() {
|
||||
var enabled = policyButton.checked;
|
||||
var remove1 = document.getElementById("removePermission");
|
||||
var remove2 = document.getElementById("removeAllPermissions");
|
||||
var description = document.getElementById("popupDescription");
|
||||
remove1.disabled = !enabled;
|
||||
remove2.disabled = !enabled;
|
||||
description.disabled = !enabled;
|
||||
manageTree.disabled = !enabled;
|
||||
}
|
||||
|
||||
|
||||
/*** =================== PERMISSIONS CODE =================== ***/
|
||||
|
||||
var permissionsTreeView = {
|
||||
rowCount : 0,
|
||||
setTree : function(tree){},
|
||||
getImageSrc : function(row,column) {},
|
||||
getProgressMode : function(row,column) {},
|
||||
getCellValue : function(row,column) {},
|
||||
getCellText : function(row,column){
|
||||
var rv="";
|
||||
if (column=="siteCol") {
|
||||
rv = permissions[row].rawHost;
|
||||
} else if (column=="statusCol") {
|
||||
rv = permissions[row].capability;
|
||||
}
|
||||
return rv;
|
||||
},
|
||||
isSeparator : function(index) {return false;},
|
||||
isSorted: function() { return false; },
|
||||
isContainer : function(index) {return false;},
|
||||
cycleHeader : function(aColId, aElt) {},
|
||||
getRowProperties : function(row,column,prop){},
|
||||
getColumnProperties : function(column,columnElement,prop){},
|
||||
getCellProperties : function(row,prop){}
|
||||
};
|
||||
var permissionsTree;
|
||||
|
||||
var permissions = [];
|
||||
var deletedPermissions = [];
|
||||
|
||||
function Permission(number, host, rawHost, type, capability) {
|
||||
this.number = number;
|
||||
this.host = host;
|
||||
this.rawHost = rawHost;
|
||||
this.type = type;
|
||||
this.capability = capability;
|
||||
}
|
||||
|
||||
var permissionmanager = Components.classes["@mozilla.org/permissionmanager;1"].getService();
|
||||
permissionmanager = permissionmanager.QueryInterface(Components.interfaces.nsIPermissionManager);
|
||||
var popupmanager = Components.classes["@mozilla.org/PopupWindowManager;1"].getService();
|
||||
popupmanager = popupmanager.QueryInterface(Components.interfaces.nsIPopupWindowManager);
|
||||
|
||||
function DeleteAllFromTree
|
||||
(tree, view, table, deletedTable, removeButton, removeAllButton) {
|
||||
|
||||
// remove all items from table and place in deleted table
|
||||
for (var i=0; i<table.length; i++) {
|
||||
deletedTable[deletedTable.length] = table[i];
|
||||
}
|
||||
table.length = 0;
|
||||
|
||||
// clear out selections
|
||||
tree.treeBoxObject.view.selection.select(-1);
|
||||
|
||||
// redisplay
|
||||
view.rowCount = 0;
|
||||
tree.treeBoxObject.invalidate();
|
||||
|
||||
|
||||
// disable buttons
|
||||
document.getElementById(removeButton).setAttribute("disabled", "true")
|
||||
document.getElementById(removeAllButton).setAttribute("disabled","true");
|
||||
}
|
||||
|
||||
function DeleteSelectedItemFromTree
|
||||
(tree, view, table, deletedTable, removeButton, removeAllButton) {
|
||||
|
||||
// remove selected items from list (by setting them to null) and place in deleted list
|
||||
var selections = GetTreeSelections(tree);
|
||||
for (var s=selections.length-1; s>= 0; s--) {
|
||||
var i = selections[s];
|
||||
deletedTable[deletedTable.length] = table[i];
|
||||
table[i] = null;
|
||||
}
|
||||
|
||||
// collapse list by removing all the null entries
|
||||
for (var j=0; j<table.length; j++) {
|
||||
if (table[j] == null) {
|
||||
var k = j;
|
||||
while ((k < table.length) && (table[k] == null)) {
|
||||
k++;
|
||||
}
|
||||
table.splice(j, k-j);
|
||||
}
|
||||
}
|
||||
|
||||
// redisplay
|
||||
var box = tree.treeBoxObject;
|
||||
var firstRow = box.getFirstVisibleRow();
|
||||
if (firstRow > (table.length-1) ) {
|
||||
firstRow = table.length-1;
|
||||
}
|
||||
view.rowCount = table.length;
|
||||
box.rowCountChanged(0, table.length);
|
||||
box.scrollToRow(firstRow)
|
||||
|
||||
// update selection and/or buttons
|
||||
if (table.length) {
|
||||
|
||||
// update selection
|
||||
// note: we need to deselect before reselecting in order to trigger ...Selected method
|
||||
var nextSelection = (selections[0] < table.length) ? selections[0] : table.length-1;
|
||||
tree.treeBoxObject.view.selection.select(-1);
|
||||
tree.treeBoxObject.view.selection.select(nextSelection);
|
||||
|
||||
} else {
|
||||
|
||||
// disable buttons
|
||||
document.getElementById(removeButton).setAttribute("disabled", "true")
|
||||
document.getElementById(removeAllButton).setAttribute("disabled","true");
|
||||
|
||||
// clear out selections
|
||||
tree.treeBoxObject.view.selection.select(-1);
|
||||
}
|
||||
}
|
||||
|
||||
function GetTreeSelections(tree) {
|
||||
var selections = [];
|
||||
var select = tree.treeBoxObject.selection;
|
||||
if (select) {
|
||||
var count = select.getRangeCount();
|
||||
var min = new Object();
|
||||
var max = new Object();
|
||||
for (var i=0; i<count; i++) {
|
||||
select.getRangeAt(i, min, max);
|
||||
for (var k=min.value; k<=max.value; k++) {
|
||||
if (k != -1) {
|
||||
selections[selections.length] = k;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return selections;
|
||||
}
|
||||
|
||||
function loadPermissions() {
|
||||
// load permissions into a table
|
||||
if (!permissionsTree)
|
||||
permissionsTree = document.getElementById("permissionsTree");
|
||||
|
||||
var enumerator = permissionmanager.enumerator;
|
||||
var count = 0;
|
||||
var contentStr;
|
||||
var dialogType = 2; // Popups
|
||||
|
||||
while (enumerator.hasMoreElements()) {
|
||||
var nextPermission = enumerator.getNext();
|
||||
nextPermission = nextPermission.QueryInterface(Components.interfaces.nsIPermission);
|
||||
if (nextPermission.type == dialogType) {
|
||||
var host = nextPermission.host;
|
||||
permissions[count] =
|
||||
new Permission(count++, host,
|
||||
(host.charAt(0)==".") ? host.substring(1,host.length) : host,
|
||||
nextPermission.type,
|
||||
"");
|
||||
}
|
||||
}
|
||||
permissionsTreeView.rowCount = permissions.length;
|
||||
|
||||
// sort and display the table
|
||||
permissionsTree.treeBoxObject.view = permissionsTreeView;
|
||||
|
||||
// disable "remove all" button if there are no popups
|
||||
if (permissions.length == 0) {
|
||||
document.getElementById("removeAllPermissions").setAttribute("disabled","true");
|
||||
} else {
|
||||
document.getElementById("removeAllPermissions").removeAttribute("disabled");
|
||||
}
|
||||
}
|
||||
|
||||
function PermissionSelected() {
|
||||
var selections = GetTreeSelections(permissionsTree);
|
||||
if (selections.length) {
|
||||
document.getElementById("removePermission").removeAttribute("disabled");
|
||||
}
|
||||
}
|
||||
|
||||
function DeletePermission() {
|
||||
DeleteSelectedItemFromTree(permissionsTree, permissionsTreeView,
|
||||
permissions, deletedPermissions,
|
||||
"removePermission", "removeAllPermissions");
|
||||
FinalizePermissionDeletions();
|
||||
}
|
||||
|
||||
function DeleteAllPermissions() {
|
||||
DeleteAllFromTree(permissionsTree, permissionsTreeView,
|
||||
permissions, deletedPermissions,
|
||||
"removePermission", "removeAllPermissions");
|
||||
FinalizePermissionDeletions();
|
||||
}
|
||||
|
||||
function FinalizePermissionDeletions() {
|
||||
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
.getService(Components.interfaces.nsIIOService);
|
||||
|
||||
for (var p=0; p<deletedPermissions.length; p++) {
|
||||
if (deletedPermissions[p].type == 2) {
|
||||
// we lost the URI's original scheme, but this will do because the scheme
|
||||
// is stripped later anyway.
|
||||
var uri = ioService.newURI("http://"+deletedPermissions[p].host, null, null);
|
||||
popupmanager.remove(uri);
|
||||
} else
|
||||
permissionmanager.remove(deletedPermissions[p].host, deletedPermissions[p].type);
|
||||
}
|
||||
deletedPermissions.length = 0;
|
||||
}
|
||||
|
||||
function HandlePermissionKeyPress(e) {
|
||||
if (e.keyCode == 46) {
|
||||
DeletePermission();
|
||||
}
|
||||
}
|
||||
|
||||
]]>
|
||||
</script>
|
||||
|
||||
@ -63,17 +296,37 @@
|
||||
<checkbox id="useProgressDialogs" label="&useProgressDialogs.label;" accesskey="&useProgressDialogs.accesskey;"
|
||||
prefstring="browser.downloads.useProgressDialogs"/>
|
||||
</groupbox>
|
||||
<groupbox>
|
||||
<caption label="&animLoopingTitle.label;"/>
|
||||
<radiogroup id="imageLooping"
|
||||
preftype="string" prefstring="image.animation_mode">
|
||||
<radio value="normal" label="&animLoopAsSpecified.label;"
|
||||
accesskey="&animLoopAsSpecified.accesskey;"/>
|
||||
<radio value="once" label="&animLoopOnce.label;"
|
||||
accesskey="&animLoopOnce.accesskey;"/>
|
||||
<radio value="none" label="&animLoopNever.label;"
|
||||
accesskey="&animLoopNever.accesskey;"/>
|
||||
</radiogroup>
|
||||
|
||||
<groupbox id="popupsArea" flex="1">
|
||||
<caption>
|
||||
<checkbox label="&popupReject.label;"
|
||||
prefstring="dom.disable_open_during_load"
|
||||
accesskey="&popupReject.accesskey;"
|
||||
oncommand="toggleEnabling()" id="popupPolicy"/>
|
||||
</caption>
|
||||
|
||||
<vbox id="servers" flex="1">
|
||||
<label id="popupDescription" value="&div.blessedservers.label;"/>
|
||||
<separator class="thin"/>
|
||||
<tree id="permissionsTree" flex="1"
|
||||
seltype="multiple" hidecolumnpicker="true"
|
||||
onkeypress="HandlePermissionKeyPress(event)"
|
||||
onselect="PermissionSelected();">
|
||||
<treecols>
|
||||
<treecol id="siteCol" hideheader="true" flex="1"/>
|
||||
</treecols>
|
||||
<treechildren/>
|
||||
</tree>
|
||||
<hbox>
|
||||
<button id="removePermission" disabled="true"
|
||||
label="&removepermission.label;"
|
||||
oncommand="DeletePermission();"/>
|
||||
<button id="removeAllPermissions"
|
||||
label="&removeallpermissions.label;"
|
||||
oncommand="DeleteAllPermissions();"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
||||
</groupbox>
|
||||
</page>
|
||||
|
||||
|
@ -1,323 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2002
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the LGPL or the GPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
|
||||
<!DOCTYPE page [
|
||||
<!ENTITY % prefPopupsDTD SYSTEM "chrome://browser/locale/pref/pref-popups.dtd" >
|
||||
%prefPopupsDTD;
|
||||
]>
|
||||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
id="popupsPanel"
|
||||
onload="init(); loadPermissions();"
|
||||
headertitle="&title;">
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["popupPolicy"];
|
||||
var policyButton;
|
||||
var manageTree;
|
||||
|
||||
function init() {
|
||||
parent.initPanel('chrome://browser/content/pref/pref-popups.xul');
|
||||
policyButton = document.getElementById("popupPolicy");
|
||||
manageTree = document.getElementById("permissionsTree");
|
||||
setButtons();
|
||||
}
|
||||
function setButtons() {
|
||||
manageTree.disabled = !policyButton.checked;
|
||||
}
|
||||
function selectPolicy() {
|
||||
setButtons();
|
||||
}
|
||||
|
||||
/*** =================== PERMISSIONS CODE =================== ***/
|
||||
|
||||
var permissionsTreeView = {
|
||||
rowCount : 0,
|
||||
setTree : function(tree){},
|
||||
getImageSrc : function(row,column) {},
|
||||
getProgressMode : function(row,column) {},
|
||||
getCellValue : function(row,column) {},
|
||||
getCellText : function(row,column){
|
||||
var rv="";
|
||||
if (column=="siteCol") {
|
||||
rv = permissions[row].rawHost;
|
||||
} else if (column=="statusCol") {
|
||||
rv = permissions[row].capability;
|
||||
}
|
||||
return rv;
|
||||
},
|
||||
isSeparator : function(index) {return false;},
|
||||
isSorted: function() { return false; },
|
||||
isContainer : function(index) {return false;},
|
||||
cycleHeader : function(aColId, aElt) {},
|
||||
getRowProperties : function(row,column,prop){},
|
||||
getColumnProperties : function(column,columnElement,prop){},
|
||||
getCellProperties : function(row,prop){}
|
||||
};
|
||||
var permissionsTree;
|
||||
|
||||
var permissions = [];
|
||||
var deletedPermissions = [];
|
||||
|
||||
function Permission(number, host, rawHost, type, capability) {
|
||||
this.number = number;
|
||||
this.host = host;
|
||||
this.rawHost = rawHost;
|
||||
this.type = type;
|
||||
this.capability = capability;
|
||||
}
|
||||
|
||||
var permissionmanager = Components.classes["@mozilla.org/permissionmanager;1"].getService();
|
||||
permissionmanager = permissionmanager.QueryInterface(Components.interfaces.nsIPermissionManager);
|
||||
var popupmanager = Components.classes["@mozilla.org/PopupWindowManager;1"].getService();
|
||||
popupmanager = popupmanager.QueryInterface(Components.interfaces.nsIPopupWindowManager);
|
||||
|
||||
function DeleteAllFromTree
|
||||
(tree, view, table, deletedTable, removeButton, removeAllButton) {
|
||||
|
||||
// remove all items from table and place in deleted table
|
||||
for (var i=0; i<table.length; i++) {
|
||||
deletedTable[deletedTable.length] = table[i];
|
||||
}
|
||||
table.length = 0;
|
||||
|
||||
// clear out selections
|
||||
tree.treeBoxObject.view.selection.select(-1);
|
||||
|
||||
// redisplay
|
||||
view.rowCount = 0;
|
||||
tree.treeBoxObject.invalidate();
|
||||
|
||||
|
||||
// disable buttons
|
||||
document.getElementById(removeButton).setAttribute("disabled", "true")
|
||||
document.getElementById(removeAllButton).setAttribute("disabled","true");
|
||||
}
|
||||
|
||||
function DeleteSelectedItemFromTree
|
||||
(tree, view, table, deletedTable, removeButton, removeAllButton) {
|
||||
|
||||
// remove selected items from list (by setting them to null) and place in deleted list
|
||||
var selections = GetTreeSelections(tree);
|
||||
for (var s=selections.length-1; s>= 0; s--) {
|
||||
var i = selections[s];
|
||||
deletedTable[deletedTable.length] = table[i];
|
||||
table[i] = null;
|
||||
}
|
||||
|
||||
// collapse list by removing all the null entries
|
||||
for (var j=0; j<table.length; j++) {
|
||||
if (table[j] == null) {
|
||||
var k = j;
|
||||
while ((k < table.length) && (table[k] == null)) {
|
||||
k++;
|
||||
}
|
||||
table.splice(j, k-j);
|
||||
}
|
||||
}
|
||||
|
||||
// redisplay
|
||||
var box = tree.treeBoxObject;
|
||||
var firstRow = box.getFirstVisibleRow();
|
||||
if (firstRow > (table.length-1) ) {
|
||||
firstRow = table.length-1;
|
||||
}
|
||||
view.rowCount = table.length;
|
||||
box.rowCountChanged(0, table.length);
|
||||
box.scrollToRow(firstRow)
|
||||
|
||||
// update selection and/or buttons
|
||||
if (table.length) {
|
||||
|
||||
// update selection
|
||||
// note: we need to deselect before reselecting in order to trigger ...Selected method
|
||||
var nextSelection = (selections[0] < table.length) ? selections[0] : table.length-1;
|
||||
tree.treeBoxObject.view.selection.select(-1);
|
||||
tree.treeBoxObject.view.selection.select(nextSelection);
|
||||
|
||||
} else {
|
||||
|
||||
// disable buttons
|
||||
document.getElementById(removeButton).setAttribute("disabled", "true")
|
||||
document.getElementById(removeAllButton).setAttribute("disabled","true");
|
||||
|
||||
// clear out selections
|
||||
tree.treeBoxObject.view.selection.select(-1);
|
||||
}
|
||||
}
|
||||
|
||||
function GetTreeSelections(tree) {
|
||||
var selections = [];
|
||||
var select = tree.treeBoxObject.selection;
|
||||
if (select) {
|
||||
var count = select.getRangeCount();
|
||||
var min = new Object();
|
||||
var max = new Object();
|
||||
for (var i=0; i<count; i++) {
|
||||
select.getRangeAt(i, min, max);
|
||||
for (var k=min.value; k<=max.value; k++) {
|
||||
if (k != -1) {
|
||||
selections[selections.length] = k;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return selections;
|
||||
}
|
||||
|
||||
function loadPermissions() {
|
||||
// load permissions into a table
|
||||
if (!permissionsTree)
|
||||
permissionsTree = document.getElementById("permissionsTree");
|
||||
|
||||
var enumerator = permissionmanager.enumerator;
|
||||
var count = 0;
|
||||
var contentStr;
|
||||
var dialogType = 2; // Popups
|
||||
|
||||
while (enumerator.hasMoreElements()) {
|
||||
var nextPermission = enumerator.getNext();
|
||||
nextPermission = nextPermission.QueryInterface(Components.interfaces.nsIPermission);
|
||||
if (nextPermission.type == dialogType) {
|
||||
var host = nextPermission.host;
|
||||
permissions[count] =
|
||||
new Permission(count++, host,
|
||||
(host.charAt(0)==".") ? host.substring(1,host.length) : host,
|
||||
nextPermission.type,
|
||||
"");
|
||||
}
|
||||
}
|
||||
permissionsTreeView.rowCount = permissions.length;
|
||||
|
||||
// sort and display the table
|
||||
permissionsTree.treeBoxObject.view = permissionsTreeView;
|
||||
|
||||
// disable "remove all" button if there are no popups
|
||||
if (permissions.length == 0) {
|
||||
document.getElementById("removeAllPermissions").setAttribute("disabled","true");
|
||||
} else {
|
||||
document.getElementById("removeAllPermissions").removeAttribute("disabled");
|
||||
}
|
||||
}
|
||||
|
||||
function PermissionSelected() {
|
||||
var selections = GetTreeSelections(permissionsTree);
|
||||
if (selections.length) {
|
||||
document.getElementById("removePermission").removeAttribute("disabled");
|
||||
}
|
||||
}
|
||||
|
||||
function DeletePermission() {
|
||||
DeleteSelectedItemFromTree(permissionsTree, permissionsTreeView,
|
||||
permissions, deletedPermissions,
|
||||
"removePermission", "removeAllPermissions");
|
||||
FinalizePermissionDeletions();
|
||||
}
|
||||
|
||||
function DeleteAllPermissions() {
|
||||
DeleteAllFromTree(permissionsTree, permissionsTreeView,
|
||||
permissions, deletedPermissions,
|
||||
"removePermission", "removeAllPermissions");
|
||||
FinalizePermissionDeletions();
|
||||
}
|
||||
|
||||
function FinalizePermissionDeletions() {
|
||||
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
.getService(Components.interfaces.nsIIOService);
|
||||
|
||||
for (var p=0; p<deletedPermissions.length; p++) {
|
||||
if (deletedPermissions[p].type == 2) {
|
||||
// we lost the URI's original scheme, but this will do because the scheme
|
||||
// is stripped later anyway.
|
||||
var uri = ioService.newURI("http://"+deletedPermissions[p].host, null, null);
|
||||
popupmanager.remove(uri);
|
||||
} else
|
||||
permissionmanager.remove(deletedPermissions[p].host, deletedPermissions[p].type);
|
||||
}
|
||||
deletedPermissions.length = 0;
|
||||
}
|
||||
|
||||
function HandlePermissionKeyPress(e) {
|
||||
if (e.keyCode == 46) {
|
||||
DeletePermission();
|
||||
}
|
||||
}
|
||||
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<groupbox id="popupsArea" flex="1">
|
||||
<caption label="&popupBlocking.label;"/>
|
||||
|
||||
<description>&popupDetails;</description>
|
||||
|
||||
<hbox align="center">
|
||||
<checkbox label="&popupReject.label;"
|
||||
prefstring="dom.disable_open_during_load"
|
||||
accesskey="&popupReject.accesskey;"
|
||||
oncommand="selectPolicy()" id="popupPolicy"/>
|
||||
<spacer flex="1"/>
|
||||
</hbox>
|
||||
|
||||
<vbox id="servers" flex="1">
|
||||
<description id="permissionsText" value="&div.blessedservers.label;"/>
|
||||
<separator class="thin"/>
|
||||
<tree id="permissionsTree" flex="1"
|
||||
seltype="multiple" hidecolumnpicker="true"
|
||||
onkeypress="HandlePermissionKeyPress(event)"
|
||||
onselect="PermissionSelected();">
|
||||
<treecols>
|
||||
<treecol id="siteCol" hideheader="true" flex="1"/>
|
||||
</treecols>
|
||||
<treechildren/>
|
||||
</tree>
|
||||
<hbox>
|
||||
<button id="removePermission" disabled="true"
|
||||
label="&removepermission.label;"
|
||||
oncommand="DeletePermission();"/>
|
||||
<button id="removeAllPermissions"
|
||||
label="&removeallpermissions.label;"
|
||||
oncommand="DeleteAllPermissions();"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
||||
</groupbox>
|
||||
|
||||
</page>
|
@ -29,15 +29,11 @@
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["histDay", "browserCacheDiskCache", "enableCookies",
|
||||
"enableCookiesForOriginatingSiteOnly", "enableCookiesForCurrentSessionOnly",
|
||||
"enableImages", "enableImagesForOriginatingSiteOnly"];
|
||||
"enableCookiesForOriginatingSiteOnly", "enableCookiesForCurrentSessionOnly"];
|
||||
function Startup() {
|
||||
var cookiesEnabled = document.getElementById("enableCookies").checked;
|
||||
var imagesEnabled = document.getElementById("enableImages").checked;
|
||||
var cookieBroadcaster = document.getElementById("cookieBroadcaster");
|
||||
var imageBroadcaster = document.getElementById("imageBroadcaster");
|
||||
cookieBroadcaster.setAttribute("disabled", !cookiesEnabled);
|
||||
imageBroadcaster.setAttribute("disabled", !imagesEnabled);
|
||||
var clearHistButton = document.getElementById("browserClearHistory");
|
||||
try {
|
||||
var urlBarHist = Components.classes["@mozilla.org/browser/urlbarhistory;1"]
|
||||
@ -50,10 +46,6 @@
|
||||
catch(ex) {
|
||||
}
|
||||
}
|
||||
function viewImages() {
|
||||
window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","_blank",
|
||||
"chrome,resizable=yes", "imageManager" );
|
||||
}
|
||||
|
||||
function viewCookies() {
|
||||
window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","_blank",
|
||||
@ -85,7 +77,6 @@
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<broadcaster id="imageBroadcaster"/>
|
||||
<broadcaster id="cookieBroadcaster"/>
|
||||
<groupbox orient="horizontal" align="center">
|
||||
<caption label="&history.label;"/>
|
||||
@ -140,25 +131,5 @@
|
||||
prefstring="pref.advanced.cookies.disable_button.view_cookies"/>
|
||||
</vbox>
|
||||
</groupbox>
|
||||
<groupbox orient="horizontal">
|
||||
<caption label="&images.label;"/>
|
||||
<vbox flex="1">
|
||||
<checkbox id="enableImages"
|
||||
oncommand="document.getElementById('imageBroadcaster').setAttribute('disabled', this.checked ? 'false' : 'true');"
|
||||
label="&enableImages.label;" accesskey="&enableImages.accesskey;"
|
||||
prefstring="network.image.enable"/>
|
||||
<checkbox id="enableImagesForOriginatingSiteOnly" observes="imageBroadcaster"
|
||||
label="&forOriginatingSiteOnly.label;"
|
||||
accesskey="&forOriginatingSiteOnly.accesskey;"
|
||||
prefstring="network.image.enableForOriginatingWebsiteOnly"
|
||||
style="margin-left: 23px;"/>
|
||||
</vbox>
|
||||
<vbox>
|
||||
<button id="manageImages"
|
||||
label="&manageImages.label;" accesskey="&manageImages.accesskey;"
|
||||
oncommand="viewImages();"
|
||||
prefstring="pref.advanced.images.disable_button.view_image"/>
|
||||
</vbox>
|
||||
</groupbox>
|
||||
</page>
|
||||
|
||||
|
@ -96,7 +96,7 @@
|
||||
<treechildren id="advancedChildren">
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-popups.xul" label="&popups.label;"/>
|
||||
<treecell url="chrome://browser/content/pref/pref-images.xul" label="&images.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
|
@ -19,7 +19,7 @@ browser.jar:
|
||||
* content/browser/pref/pref-scripts.xul (content/pref-scripts.xul)
|
||||
* content/browser/pref/pref-scripts.js (content/pref-scripts.js)
|
||||
* content/browser/pref/pref-privacy.xul (content/pref-privacy.xul)
|
||||
* content/browser/pref/pref-popups.xul (content/pref-popups.xul)
|
||||
* content/browser/pref/pref-images.xul (content/pref-images.xul)
|
||||
* content/browser/pref/pref.xul (content/pref.xul)
|
||||
* content/browser/pref/nsPrefWindow.js (content/nsPrefWindow.js)
|
||||
* content/browser/pref/pref-winhooks.xul (content/pref-winhooks.xul)
|
||||
@ -35,10 +35,10 @@ en-US.jar:
|
||||
locale/en-US/browser/pref/pref-tabs.dtd (locale/pref-tabs.dtd)
|
||||
locale/en-US/browser/pref/pref-languages.properties (locale/pref-languages.properties)
|
||||
* locale/en-US/browser/pref/pref-navigator.dtd (locale/pref-navigator.dtd)
|
||||
locale/en-US/browser/pref/pref-images.dtd (locale/pref-images.dtd)
|
||||
locale/en-US/browser/pref/pref-connection.dtd (locale/pref-connection.dtd)
|
||||
locale/en-US/browser/pref/pref-scripts.dtd (locale/pref-scripts.dtd)
|
||||
locale/en-US/browser/pref/pref-privacy.dtd (locale/pref-privacy.dtd)
|
||||
locale/en-US/browser/pref/pref-popups.dtd (locale/pref-popups.dtd)
|
||||
locale/en-US/browser/pref/prefutilities.properties (locale/prefutilities.properties)
|
||||
* locale/en-US/browser/pref/pref.dtd (locale/pref.dtd)
|
||||
locale/en-US/browser/pref/pref-winhooks.dtd (locale/pref-winhooks.dtd)
|
||||
|
@ -8,13 +8,13 @@
|
||||
<!ENTITY useProgressDialogs.label "Display a progress window when starting a download">
|
||||
<!ENTITY useProgressDialogs.accesskey "D">
|
||||
|
||||
<!ENTITY animLoopingTitle.label "Animated images should loop">
|
||||
<!ENTITY animLoopAsSpecified.label "As many times as the image specifies">
|
||||
<!ENTITY animLoopAsSpecified.accesskey "m">
|
||||
<!ENTITY animLoopOnce.label "Once">
|
||||
<!ENTITY animLoopOnce.accesskey "O">
|
||||
<!ENTITY animLoopNever.label "Never">
|
||||
<!ENTITY animLoopNever.accesskey "v">
|
||||
<!ENTITY sendAddFtpCheck.label "Send this email address as anonymous FTP password:">
|
||||
<!ENTITY sendAddFtpCheck.accesskey "e">
|
||||
<!ENTITY general.label "General">
|
||||
<!ENTITY popupReject.label "Reject popup windows">
|
||||
<!ENTITY popupReject.accesskey "r">
|
||||
|
||||
<!ENTITY div.blessedservers.label "Always allow the sites below to open popup windows:">
|
||||
|
||||
<!ENTITY removepermission.label "Remove Site">
|
||||
<!ENTITY removeallpermissions.label "Remove All Sites">
|
||||
|
@ -1,16 +0,0 @@
|
||||
<!ENTITY title "Popups">
|
||||
|
||||
<!ENTITY popupBlocking.label "Popup Window Policy">
|
||||
|
||||
<!ENTITY popupDetails "When websites attempt to open new windows without being asked">
|
||||
|
||||
<!ENTITY popupReject.label "Reject popup windows">
|
||||
<!ENTITY popupReject.accesskey "r">
|
||||
|
||||
<!ENTITY popupView.label "Manage Popup Permissions">
|
||||
<!ENTITY popupView.accesskey "m">
|
||||
|
||||
<!ENTITY div.blessedservers.label "Always allow the sites below to open popup windows:">
|
||||
|
||||
<!ENTITY removepermission.label "Remove Site">
|
||||
<!ENTITY removeallpermissions.label "Remove All Sites">
|
@ -12,11 +12,6 @@
|
||||
<!ENTITY pageHis.label "Remember visited pages for the last">
|
||||
<!ENTITY pageHis.accesskey "p">
|
||||
<!ENTITY days.label "days">
|
||||
<!ENTITY images.label "Images">
|
||||
<!ENTITY enableImages.label "Enable images">
|
||||
<!ENTITY enableImages.accesskey "i">
|
||||
<!ENTITY manageImages.label "Manage Images...">
|
||||
<!ENTITY manageImages.accesskey "n">
|
||||
<!ENTITY cache.label "Cache">
|
||||
<!ENTITY diskCache.label "Use up to:">
|
||||
<!ENTITY diskCache.accesskey "U">
|
||||
|
@ -20,7 +20,7 @@
|
||||
<!ENTITY privacy.label "Privacy">
|
||||
<!ENTITY advance.label "Advanced">
|
||||
<!ENTITY connection.label "Connection">
|
||||
<!ENTITY popups.label "Popup Windows">
|
||||
<!ENTITY images.label "Images">
|
||||
<!ENTITY scriptsAndWindows.label "JavaScript">
|
||||
<!ENTITY tabs.label "Tabbed Browsing">
|
||||
#ifdef XP_WIN
|
||||
|
Loading…
Reference in New Issue
Block a user