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

Bug 277097 Tidy up cookie js/xul/pref code (Removing js/xul from extensions/cookie) - history for pref-cookies.xul/dtd and pref-images.xul/dtd can be got from the attic (see bug for details)

Browse Source 
p=me r=dwitte/benjamin sr=darin


git-svn-id: svn://10.0.0.236/trunk@204922 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%arlen.demon.co.uk 2006-07-27 14:59:01 +00:00
parent a0fce60208
commit 16afb33efb
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/suite/common/permissions/aboutPopups.xul
View File

@ -40,7 +40,7 @@
<!DOCTYPE dialog [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
%brandDTD;
<!ENTITY % aboutPopupsDTD SYSTEM "chrome://communicator/locale/aboutPopups.dtd" >
<!ENTITY % aboutPopupsDTD SYSTEM "chrome://communicator/locale/permissions/aboutPopups.dtd" >
%aboutPopupsDTD;
]>
@ -80,7 +80,7 @@
}
catch(ex) { }
goPreferences("securityItem", "chrome://cookie/content/pref-popups.xul", "popupspref");
goPreferences("securityItem", "chrome://communicator/content/pref/pref-popups.xul", "popupspref");
}
function doHelpButton() {

2
mozilla/suite/common/permissions/cookieP3P.xul
View File

@ -42,7 +42,7 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!-- CHANGE THIS WHEN MOVING FILES -->
<!DOCTYPE dialog SYSTEM "chrome://cookie/locale/p3p.dtd">
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/cookieP3P.dtd">
<dialog id="privacySettings"
buttons="accept,cancel,help"

2
mozilla/suite/common/permissions/cookieP3PDialog.xul
View File

@ -42,7 +42,7 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!-- CHANGE THIS WHEN MOVING FILES -->
<!DOCTYPE dialog SYSTEM "chrome://cookie/locale/p3p.dtd">
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/cookieP3P.dtd">
<dialog id="p3pDialog"
buttons="accept,cancel,extra1,extra2,help"

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

@ -37,12 +37,12 @@
***** END LICENSE BLOCK ***** -->
<!DOCTYPE overlay SYSTEM "chrome://cookie/locale/cookieTasksOverlay.dtd">
<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/permissions/cookieTasksOverlay.dtd">
<overlay id="cookieTasksOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
<script type="application/x-javascript">
<![CDATA[
@ -72,7 +72,7 @@
observerService.notifyObservers(null, "cookieIcon", "off");
window.openDialog
("chrome://cookie/content/p3pDialog.xul","_blank","modal=yes,chrome,resizable=no", this);
("chrome://communicator/content/permissions/cookieP3PDialog.xul","_blank","modal=yes,chrome,resizable=no", this);
if (gButtonPressed == "cookie") {
viewCookiesFromIcon();
} else if (gButtonPressed == "p3p") {

8
mozilla/suite/common/permissions/cookieViewer.xul
View File

@ -41,7 +41,7 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!-- CHANGE THIS WHEN MOVING FILES -->
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/wallet/CookieViewer.dtd" >
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/cookieViewer.dtd" >
<dialog id="cookieviewer"
buttons="accept,help"
@ -54,14 +54,14 @@
ondialoghelp="doHelpButton();"
persist="screenX screenY width height">
<script src="chrome://communicator/content/wallet/CookieViewer.js"/>
<script src="chrome://communicator/content/permissions/cookieViewer.js"/>
<script src="chrome://global/content/strres.js"/>
<script src="chrome://communicator/content/wallet/nsWalletTreeUtils.js"/>
<script src="chrome://communicator/content/permissions/treeUtils.js"/>
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
<keyset id="dialogKeys"/>
<stringbundle id="cookieBundle"
src="chrome://communicator/locale/wallet/CookieViewer.properties"/>
src="chrome://communicator/locale/permissions/cookieViewer.properties"/>
<tabbox id="tabbox" flex="1">
<tabs>

4
mozilla/suite/common/permissions/imageContextOverlay.xul
View File

@ -37,12 +37,12 @@
***** END LICENSE BLOCK ***** -->
<!DOCTYPE overlay SYSTEM "chrome://cookie/locale/cookieContextOverlay.dtd">
<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/permissions/imageContextOverlay.dtd">
<overlay id="cookieContextOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
<script type="application/x-javascript">
<![CDATA[

8
mozilla/suite/common/permissions/permissionsManager.xul
View File

@ -36,7 +36,7 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/popupManager.dtd" >
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/permissionsManager.dtd" >
<dialog id="popupManager"
buttons="accept,cancel,help"
@ -48,14 +48,14 @@
ondialogaccept="return onAccept();"
ondialoghelp="return doHelpButton();">
<script type="application/x-javascript" src="chrome://communicator/content/popupManager.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsManager.js"/>
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/wallet/nsWalletTreeUtils.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/permissions/treeUtils.js"/>
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
<keyset id="dialogKeys"/>
<stringbundle id="popupStringBundle"
src="chrome://communicator/locale/popupManager.properties"/>
src="chrome://communicator/locale/permissions/permissionsManager.properties"/>
<vbox id="servers" flex="1">

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

@ -37,12 +37,12 @@
***** END LICENSE BLOCK ***** -->
<!DOCTYPE overlay SYSTEM "chrome://cookie/locale/cookieNavigatorOverlay.dtd">
<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/permissions/permissionsNavigatorOverlay.dtd">
<overlay id="cookieNavigatorOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
<script type="application/x-javascript">
<![CDATA[
/******* THE FOLLOWING IS FOR THE TASKMENU OVERLAY *******/
@ -180,13 +180,13 @@
}
function OpenAboutPopups() {
window.openDialog("chrome://communicator/content/aboutPopups.xul", "",
window.openDialog("chrome://communicator/content/permissions/aboutPopups.xul", "",
"chrome,centerscreen,dependent",
false);
}
function OpenManagePopups(host) {
window.openDialog("chrome://communicator/content/popupManager.xul", "",
window.openDialog("chrome://communicator/content/permissions/permissionsManager.xul", "",
"chrome,resizable=yes",
host);
}

4
mozilla/suite/common/permissions/permissionsOverlay.js
View File

@ -49,7 +49,7 @@ function openCookieViewer(viewerType)
return;
}
}
window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul",
window.openDialog("chrome://communicator/content/permissions/cookieViewer.xul",
"_blank", "chrome,resizable", viewerType);
}
@ -67,5 +67,5 @@ function viewCookiesFromIcon() {
function viewP3P() {
window.openDialog
("chrome://cookie/content/p3p.xul","_blank","chrome,resizable=no");
("chrome://communicator/content/permissions/cookieP3P.xul","_blank","chrome,resizable=no");
}