зеркало из https://github.com/mozilla/pjs.git
adding a popup window management preference panel. bug 166442 r=jag,jst
This commit is contained in:
danm%netscape.com
Родитель
97220f560e
Коммит
480a2cfa86
|
|
@ -6,6 +6,7 @@ comm.jar:
|
|||
content/cookie/cookiePrefsOverlay.xul (resources/content/cookiePrefsOverlay.xul)
|
||||
content/cookie/pref-cookies.xul (resources/content/pref-cookies.xul)
|
||||
content/cookie/pref-images.xul (resources/content/pref-images.xul)
|
||||
content/cookie/pref-popups.xul (resources/content/pref-popups.xul)
|
||||
content/cookie/cookieOverlay.js (resources/content/cookieOverlay.js)
|
||||
content/cookie/p3p.xul (resources/content/p3p.xul)
|
||||
content/cookie/p3pDialog.xul (resources/content/p3pDialog.xul)
|
||||
|
|
@ -28,6 +29,7 @@ en-US.jar:
|
|||
locale/en-US/cookie/cookiePrefsOverlay.dtd (resources/locale/en-US/cookiePrefsOverlay.dtd)
|
||||
locale/en-US/cookie/pref-cookies.dtd (resources/locale/en-US/pref-cookies.dtd)
|
||||
locale/en-US/cookie/pref-images.dtd (resources/locale/en-US/pref-images.dtd)
|
||||
locale/en-US/cookie/pref-popups.dtd (resources/locale/en-US/pref-popups.dtd)
|
||||
locale/en-US/cookie/p3p.dtd (resources/locale/en-US/p3p.dtd)
|
||||
locale/en-US/cookie/cookie.properties (resources/locale/en-US/cookie.properties)
|
||||
locale/en-US/cookie/cookieAcceptDialog.properties (resources/locale/en-US/cookieAcceptDialog.properties)
|
||||
|
|
|
|||
|
|
@ -40,6 +40,12 @@
|
|||
label="&images.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem position="3">
|
||||
<treerow>
|
||||
<treecell url="chrome://cookie/content/pref-popups.xul"
|
||||
label="&popups.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
||||
</overlay>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,116 @@
|
|||
<?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://communicator/skin/" type="text/css"?>
|
||||
|
||||
<!DOCTYPE page [
|
||||
<!ENTITY % prefPopupsDTD SYSTEM "chrome://cookie/locale/pref-popups.dtd" >
|
||||
%prefPopupsDTD;
|
||||
]>
|
||||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
id="popupsPanel"
|
||||
onload="init()"
|
||||
headertitle="&title;">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["popupPolicy","popupCustom"];
|
||||
var domCbox = null;
|
||||
var policyButton;
|
||||
var customCbox;
|
||||
var manageButton;
|
||||
|
||||
function init() {
|
||||
parent.initPanel('chrome://cookie/content/pref-popups.xul');
|
||||
policyButton = document.getElementById("popupPolicy");
|
||||
customCbox = document.getElementById("popupCustom");
|
||||
manageButton = document.getElementById("popupView");
|
||||
setButtons(true);
|
||||
}
|
||||
function setButtons(all) {
|
||||
if (all)
|
||||
customCbox.disabled = policyButton.value == 2;
|
||||
manageButton.disabled = policyButton.value == 2 || !customCbox.checked;
|
||||
}
|
||||
function selectPolicy() {
|
||||
if (!domCbox) {
|
||||
// any selection clears the competing DOM pref
|
||||
domCbox = document.getElementById("popupDomShadow");
|
||||
_elementIDs.push("popupDomShadow");
|
||||
domCbox.checked = false;
|
||||
}
|
||||
setButtons(true);
|
||||
}
|
||||
function selectCustom() {
|
||||
setButtons(false);
|
||||
}
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<groupbox id="popupsArea">
|
||||
<caption label="&popupBlocking.label;"/>
|
||||
|
||||
<description>&popupDetails;</description>
|
||||
|
||||
<radiogroup id="popupPolicy" prefstring="privacy.popups.policy">
|
||||
<radio value="1" label="&popupAllow.label;"
|
||||
accesskey="&popupAllow.accesskey;"
|
||||
oncommand="selectPolicy()"/>
|
||||
<checkbox id="popupCustom" label="&popupCustom.label;"
|
||||
style="margin-left:2em"
|
||||
prefstring="privacy.popups.usecustom"
|
||||
oncommand="selectCustom(this)"/>
|
||||
<radio value="2" label="&popupReject.label;"
|
||||
accesskey="&popupReject.accesskey;"
|
||||
oncommand="selectPolicy()"/>
|
||||
</radiogroup>
|
||||
|
||||
<checkbox id="popupDomShadow" hidden="true"
|
||||
prefstring="dom.disable_open_during_load"/>
|
||||
|
||||
<hbox pack="end">
|
||||
<button id="popupView" label="&popupView.label;"
|
||||
accesskey="&popupView.accesskey;" oncommand="viewPopups();"/>
|
||||
</hbox>
|
||||
|
||||
</groupbox>
|
||||
|
||||
</page>
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
<!ENTITY cookies.label "Cookies">
|
||||
<!ENTITY images.label "Images">
|
||||
<!ENTITY popups.label "Popups">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
<!ENTITY title "Pop-ups">
|
||||
|
||||
<!ENTITY popupBlocking.label "Pop-up Window Policy">
|
||||
|
||||
<!ENTITY popupDetails "When websites attempt to open new windows without being asked">
|
||||
|
||||
<!ENTITY popupAllow.label "Allow pop-up windows">
|
||||
<!ENTITY popupAllow.accesskey "a">
|
||||
<!ENTITY popupReject.label "Reject pop-up windows">
|
||||
<!ENTITY popupReject.accesskey "r">
|
||||
|
||||
<!ENTITY popupCustom.label "Use custom settings">
|
||||
<!ENTITY popupCustom.accesskey "c">
|
||||
|
||||
<!ENTITY popupView.label "Manage Popup Permissions">
|
||||
<!ENTITY popupView.accesskey "m">
|
||||
|
|
@ -40,6 +40,12 @@
|
|||
label="&images.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem position="3">
|
||||
<treerow>
|
||||
<treecell url="chrome://cookie/content/pref-popups.xul"
|
||||
label="&popups.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
||||
</overlay>
|
||||
|
|
|
|||
|
|
@ -40,6 +40,12 @@
|
|||
label="&images.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem position="3">
|
||||
<treerow>
|
||||
<treecell url="chrome://cookie/content/pref-popups.xul"
|
||||
label="&popups.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
||||
</overlay>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,116 @@
|
|||
<?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://communicator/skin/" type="text/css"?>
|
||||
|
||||
<!DOCTYPE page [
|
||||
<!ENTITY % prefPopupsDTD SYSTEM "chrome://cookie/locale/pref-popups.dtd" >
|
||||
%prefPopupsDTD;
|
||||
]>
|
||||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
id="popupsPanel"
|
||||
onload="init()"
|
||||
headertitle="&title;">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["popupPolicy","popupCustom"];
|
||||
var domCbox = null;
|
||||
var policyButton;
|
||||
var customCbox;
|
||||
var manageButton;
|
||||
|
||||
function init() {
|
||||
parent.initPanel('chrome://cookie/content/pref-popups.xul');
|
||||
policyButton = document.getElementById("popupPolicy");
|
||||
customCbox = document.getElementById("popupCustom");
|
||||
manageButton = document.getElementById("popupView");
|
||||
setButtons(true);
|
||||
}
|
||||
function setButtons(all) {
|
||||
if (all)
|
||||
customCbox.disabled = policyButton.value == 2;
|
||||
manageButton.disabled = policyButton.value == 2 || !customCbox.checked;
|
||||
}
|
||||
function selectPolicy() {
|
||||
if (!domCbox) {
|
||||
// any selection clears the competing DOM pref
|
||||
domCbox = document.getElementById("popupDomShadow");
|
||||
_elementIDs.push("popupDomShadow");
|
||||
domCbox.checked = false;
|
||||
}
|
||||
setButtons(true);
|
||||
}
|
||||
function selectCustom() {
|
||||
setButtons(false);
|
||||
}
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<groupbox id="popupsArea">
|
||||
<caption label="&popupBlocking.label;"/>
|
||||
|
||||
<description>&popupDetails;</description>
|
||||
|
||||
<radiogroup id="popupPolicy" prefstring="privacy.popups.policy">
|
||||
<radio value="1" label="&popupAllow.label;"
|
||||
accesskey="&popupAllow.accesskey;"
|
||||
oncommand="selectPolicy()"/>
|
||||
<checkbox id="popupCustom" label="&popupCustom.label;"
|
||||
style="margin-left:2em"
|
||||
prefstring="privacy.popups.usecustom"
|
||||
oncommand="selectCustom(this)"/>
|
||||
<radio value="2" label="&popupReject.label;"
|
||||
accesskey="&popupReject.accesskey;"
|
||||
oncommand="selectPolicy()"/>
|
||||
</radiogroup>
|
||||
|
||||
<checkbox id="popupDomShadow" hidden="true"
|
||||
prefstring="dom.disable_open_during_load"/>
|
||||
|
||||
<hbox pack="end">
|
||||
<button id="popupView" label="&popupView.label;"
|
||||
accesskey="&popupView.accesskey;" oncommand="viewPopups();"/>
|
||||
</hbox>
|
||||
|
||||
</groupbox>
|
||||
|
||||
</page>
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
<!ENTITY cookies.label "Cookies">
|
||||
<!ENTITY images.label "Images">
|
||||
<!ENTITY popups.label "Popups">
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
<!ENTITY cookies.label "Cookies">
|
||||
<!ENTITY images.label "Images">
|
||||
<!ENTITY popups.label "Popups">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
<!ENTITY title "Pop-ups">
|
||||
|
||||
<!ENTITY popupBlocking.label "Pop-up Window Policy">
|
||||
|
||||
<!ENTITY popupDetails "When websites attempt to open new windows without being asked">
|
||||
|
||||
<!ENTITY popupAllow.label "Allow pop-up windows">
|
||||
<!ENTITY popupAllow.accesskey "a">
|
||||
<!ENTITY popupReject.label "Reject pop-up windows">
|
||||
<!ENTITY popupReject.accesskey "r">
|
||||
|
||||
<!ENTITY popupCustom.label "Use custom settings">
|
||||
<!ENTITY popupCustom.accesskey "c">
|
||||
|
||||
<!ENTITY popupView.label "Manage Popup Permissions">
|
||||
<!ENTITY popupView.accesskey "m">
|
||||
Загрузка…
Ссылка в новой задаче