[PALEMOON] Moving About permissions component files from components/preferences/ to components/permissions/

Issue #191
This commit is contained in:
janekptacijarabaci 2018-06-11 09:52:55 +02:00 committed by Roy Tam
commit d5fdf1c3e1
18 changed files with 32 additions and 18 deletions

View file

@ -62,7 +62,7 @@ static RedirEntry kRedirMap[] = {
nsIAboutModule::HIDE_FROM_ABOUTABOUT
},
{
"permissions", "chrome://browser/content/preferences/aboutPermissions.xul",
"permissions", "chrome://browser/content/permissions/aboutPermissions.xul",
nsIAboutModule::ALLOW_SCRIPT
},
{

View file

@ -12,6 +12,7 @@ DIRS += [
'feeds',
'fuel',
'places',
'permissions',
'preferences',
'privatebrowsing',
'search',

View file

@ -3,9 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
.site {
-moz-binding: url("chrome://browser/content/preferences/aboutPermissions.xml#site");
-moz-binding: url("chrome://browser/content/permissions/aboutPermissions.xml#site");
}
.pluginPermission {
-moz-binding: url("chrome://browser/content/preferences/aboutPermissions.xml#pluginPermission");
-moz-binding: url("chrome://browser/content/permissions/aboutPermissions.xml#pluginPermission");
}

View file

@ -480,7 +480,7 @@ var AboutPermissions = {
.createBundle("chrome://browser/locale/browser.properties"),
_stringBundleAboutPermissions: Services.strings.createBundle(
"chrome://browser/locale/preferences/aboutPermissions.properties"),
"chrome://browser/locale/permissions/aboutPermissions.properties"),
_initPart1: function() {
this.initPluginList();

View file

@ -4,7 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE bindings [
<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/preferences/aboutPermissions.dtd" >
<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/permissions/aboutPermissions.dtd" >
%aboutPermissionsDTD;
]>

View file

@ -4,13 +4,13 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/preferences/aboutPermissions.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/aboutPermissions.css"?>
<?xml-stylesheet href="chrome://browser/content/permissions/aboutPermissions.css"?>
<?xml-stylesheet href="chrome://browser/skin/permissions/aboutPermissions.css"?>
<!DOCTYPE page [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/preferences/aboutPermissions.dtd" >
<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/permissions/aboutPermissions.dtd" >
%aboutPermissionsDTD;
]>
@ -23,7 +23,7 @@
role="application">
<script type="application/javascript"
src="chrome://browser/content/preferences/aboutPermissions.js"/>
src="chrome://browser/content/permissions/aboutPermissions.js"/>
<keyset>
<key key="&focusSearch.key;" modifiers="accel" oncommand="AboutPermissions.focusFilterBox();"/>

View file

@ -0,0 +1,9 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
browser.jar:
content/browser/permissions/aboutPermissions.xul
content/browser/permissions/aboutPermissions.js
content/browser/permissions/aboutPermissions.css
content/browser/permissions/aboutPermissions.xml

View file

@ -0,0 +1,8 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']

View file

@ -3,10 +3,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
browser.jar:
content/browser/preferences/aboutPermissions.xul
content/browser/preferences/aboutPermissions.js
content/browser/preferences/aboutPermissions.css
content/browser/preferences/aboutPermissions.xml
* content/browser/preferences/advanced.xul
* content/browser/preferences/advanced.js
content/browser/preferences/applications.xul

View file

@ -55,8 +55,8 @@
locale/browser/places/moveBookmarks.dtd (%chrome/browser/places/moveBookmarks.dtd)
locale/browser/feeds/subscribe.dtd (%chrome/browser/feeds/subscribe.dtd)
locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties)
locale/browser/preferences/aboutPermissions.dtd (%chrome/browser/preferences/aboutPermissions.dtd)
locale/browser/preferences/aboutPermissions.properties (%chrome/browser/preferences/aboutPermissions.properties)
locale/browser/permissions/aboutPermissions.dtd (%chrome/browser/permissions/aboutPermissions.dtd)
locale/browser/permissions/aboutPermissions.properties (%chrome/browser/permissions/aboutPermissions.properties)
locale/browser/preferences/advanced.dtd (%chrome/browser/preferences/advanced.dtd)
locale/browser/preferences/applicationManager.dtd (%chrome/browser/preferences/applicationManager.dtd)
locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties)

View file

@ -97,6 +97,7 @@ browser.jar:
skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png)
skin/classic/browser/places/unsortedBookmarks.png (places/unsortedBookmarks.png)
skin/classic/browser/places/downloads.png (places/downloads.png)
skin/classic/browser/permissions/aboutPermissions.css (permissions/aboutPermissions.css)
skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png)
skin/classic/browser/preferences/mail.png (preferences/mail.png)
skin/classic/browser/preferences/Options.png (preferences/Options.png)
@ -105,7 +106,6 @@ browser.jar:
#endif
* skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
#ifdef MOZ_BROWSER_STATUSBAR
skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css)
* skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css)

View file

@ -123,6 +123,7 @@ browser.jar:
skin/classic/browser/places/livemark-item.png (places/livemark-item.png)
skin/classic/browser/places/expander-closed.png (places/expander-closed.png)
skin/classic/browser/places/expander-open.png (places/expander-open.png)
skin/classic/browser/permissions/aboutPermissions.css (permissions/aboutPermissions.css)
skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png)
skin/classic/browser/preferences/application.png (preferences/application.png)
skin/classic/browser/preferences/mail.png (preferences/mail.png)
@ -133,7 +134,6 @@ browser.jar:
skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png)
* skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
#ifdef MOZ_BROWSER_STATUSBAR
skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css)
* skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css)

View file

@ -117,6 +117,7 @@ browser.jar:
skin/classic/browser/places/unsortedBookmarks.png (places/unsortedBookmarks.png)
skin/classic/browser/places/downloads.png (places/downloads.png)
skin/classic/browser/places/livemark-item.png (places/livemark-item.png)
skin/classic/browser/permissions/aboutPermissions.css (permissions/aboutPermissions.css)
skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png)
skin/classic/browser/preferences/application.png (preferences/application.png)
skin/classic/browser/preferences/mail.png (preferences/mail.png)
@ -127,7 +128,6 @@ browser.jar:
skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png)
* skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
#ifdef MOZ_BROWSER_STATUSBAR
skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css)
* skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css)