зеркало из https://github.com/mozilla/gecko-dev.git
Bug 851702 - Remove JS load and advanced preferences from the UI, r=gavin
This commit is contained in:
Родитель
bd916210f8
Коммит
3da832b093
|
@ -1,46 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
|
|
||||||
<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
|
|
||||||
<!-- 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/. -->
|
|
||||||
|
|
||||||
<!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/advanced-scripts.dtd">
|
|
||||||
|
|
||||||
<?xml-stylesheet href="chrome://global/skin/"?>
|
|
||||||
|
|
||||||
<prefwindow id="AdvancedJSDialog" type="child"
|
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
|
||||||
title="&advancedJSDialog.title;"
|
|
||||||
dlgbuttons="accept,cancel,help"
|
|
||||||
ondialoghelp="openPrefsHelp()">
|
|
||||||
|
|
||||||
<script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
|
|
||||||
|
|
||||||
<prefpane id="AdvancedJSDialogPane"
|
|
||||||
helpTopic="prefs-advanced-javascript">
|
|
||||||
|
|
||||||
<preferences>
|
|
||||||
<preference id="dom.event.contextmenu.enabled" name="dom.event.contextmenu.enabled" type="bool"/>
|
|
||||||
<preference id="dom.disable_window_move_resize" name="dom.disable_window_move_resize" type="bool" inverted="true"/>
|
|
||||||
<preference id="dom.disable_window_flip" name="dom.disable_window_flip" type="bool" inverted="true"/>
|
|
||||||
</preferences>
|
|
||||||
|
|
||||||
<script type="application/javascript" src="chrome://browser/content/preferences/advanced-scripts.js"/>
|
|
||||||
|
|
||||||
<stringbundle id="preferencesBundle" src="chrome://browser/locale/preferences/preferences.properties"/>
|
|
||||||
|
|
||||||
<description value="&allowScripts.label;"/>
|
|
||||||
|
|
||||||
<checkbox id="moveResizePopupWindows" label="&moveResizePopupWindows.label;"
|
|
||||||
accesskey="&moveResizePopupWindows.accesskey;"
|
|
||||||
preference="dom.disable_window_move_resize"/>
|
|
||||||
<checkbox id="raiseLowerWindows" label="&raiseLowerWindows.label;"
|
|
||||||
accesskey="&raiseLowerWindows.accesskey;"
|
|
||||||
preference="dom.disable_window_flip"/>
|
|
||||||
<checkbox id="disableContextMenus" label="&disableContextMenus.label;"
|
|
||||||
accesskey="&disableContextMenus.accesskey;"
|
|
||||||
preference="dom.event.contextmenu.enabled"/>
|
|
||||||
|
|
||||||
</prefpane>
|
|
||||||
</prefwindow>
|
|
|
@ -61,8 +61,6 @@ var gContentPane = {
|
||||||
*
|
*
|
||||||
* dom.disable_open_during_load
|
* dom.disable_open_during_load
|
||||||
* - true if popups are blocked by default, false otherwise
|
* - true if popups are blocked by default, false otherwise
|
||||||
* javascript.enabled
|
|
||||||
* - true if JavaScript is enabled, false otherwise
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// POP-UPS
|
// POP-UPS
|
||||||
|
@ -76,17 +74,6 @@ var gContentPane = {
|
||||||
this._showExceptions("popup");
|
this._showExceptions("popup");
|
||||||
},
|
},
|
||||||
|
|
||||||
// JAVASCRIPT
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Displays the advanced JavaScript preferences for enabling or disabling
|
|
||||||
* various annoying behaviors.
|
|
||||||
*/
|
|
||||||
showAdvancedJS: function ()
|
|
||||||
{
|
|
||||||
document.documentElement.openSubDialog("chrome://browser/content/preferences/advanced-scripts.xul",
|
|
||||||
"", null);
|
|
||||||
},
|
|
||||||
|
|
||||||
// FONTS
|
// FONTS
|
||||||
|
|
||||||
|
|
|
@ -22,13 +22,8 @@
|
||||||
<preferences id="contentPreferences">
|
<preferences id="contentPreferences">
|
||||||
<!--XXX buttons prefs -->
|
<!--XXX buttons prefs -->
|
||||||
|
|
||||||
<!-- POPUPS, JAVASCRIPT -->
|
<!-- POPUPS -->
|
||||||
<preference id="dom.disable_open_during_load" name="dom.disable_open_during_load" type="bool"/>
|
<preference id="dom.disable_open_during_load" name="dom.disable_open_during_load" type="bool"/>
|
||||||
<preference id="javascript.enabled" name="javascript.enabled" type="bool"/>
|
|
||||||
|
|
||||||
<preference id="pref.advanced.javascript.disable_button.advanced"
|
|
||||||
name="pref.advanced.javascript.disable_button.advanced"
|
|
||||||
type="bool"/>
|
|
||||||
|
|
||||||
<!-- FONTS -->
|
<!-- FONTS -->
|
||||||
<preference id="font.language.group"
|
<preference id="font.language.group"
|
||||||
|
@ -61,20 +56,6 @@
|
||||||
oncommand="gContentPane.showPopupExceptions();"
|
oncommand="gContentPane.showPopupExceptions();"
|
||||||
accesskey="&popupExceptions.accesskey;"/>
|
accesskey="&popupExceptions.accesskey;"/>
|
||||||
</row>
|
</row>
|
||||||
<row id="enableJavaScriptRow">
|
|
||||||
<vbox align="start">
|
|
||||||
<checkbox id="enableJavaScript" preference="javascript.enabled"
|
|
||||||
label="&enableJavaScript.label;" accesskey="&enableJavaScript.accesskey;"
|
|
||||||
onsyncfrompreference="return gContentPane.updateButtons('advancedJSButton',
|
|
||||||
'javascript.enabled');"/>
|
|
||||||
</vbox>
|
|
||||||
<vbox>
|
|
||||||
<button id="advancedJSButton" label="&advancedJS.label;"
|
|
||||||
accesskey="&advancedJS.accesskey;"
|
|
||||||
oncommand="gContentPane.showAdvancedJS();"
|
|
||||||
preference="pref.advanced.javascript.disable_button.advanced"/>
|
|
||||||
</vbox>
|
|
||||||
</row>
|
|
||||||
</rows>
|
</rows>
|
||||||
</grid>
|
</grid>
|
||||||
</groupbox>
|
</groupbox>
|
||||||
|
|
|
@ -61,8 +61,6 @@ var gContentPane = {
|
||||||
*
|
*
|
||||||
* dom.disable_open_during_load
|
* dom.disable_open_during_load
|
||||||
* - true if popups are blocked by default, false otherwise
|
* - true if popups are blocked by default, false otherwise
|
||||||
* javascript.enabled
|
|
||||||
* - true if JavaScript is enabled, false otherwise
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// POP-UPS
|
// POP-UPS
|
||||||
|
@ -76,18 +74,6 @@ var gContentPane = {
|
||||||
this._showExceptions("popup");
|
this._showExceptions("popup");
|
||||||
},
|
},
|
||||||
|
|
||||||
// JAVASCRIPT
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Displays the advanced JavaScript preferences for enabling or disabling
|
|
||||||
* various annoying behaviors.
|
|
||||||
*/
|
|
||||||
showAdvancedJS: function ()
|
|
||||||
{
|
|
||||||
openDialog("chrome://browser/content/preferences/advanced-scripts.xul",
|
|
||||||
"Browser:AdvancedScripts", null);
|
|
||||||
},
|
|
||||||
|
|
||||||
// FONTS
|
// FONTS
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -4,16 +4,10 @@
|
||||||
|
|
||||||
<preferences id="contentPreferences">
|
<preferences id="contentPreferences">
|
||||||
|
|
||||||
<!-- Popups and JavaScript -->
|
<!-- Popups -->
|
||||||
<preference id="dom.disable_open_during_load"
|
<preference id="dom.disable_open_during_load"
|
||||||
name="dom.disable_open_during_load"
|
name="dom.disable_open_during_load"
|
||||||
type="bool"/>
|
type="bool"/>
|
||||||
<preference id="javascript.enabled"
|
|
||||||
name="javascript.enabled"
|
|
||||||
type="bool"/>
|
|
||||||
<preference id="pref.advanced.javascript.disable_button.advanced"
|
|
||||||
name="pref.advanced.javascript.disable_button.advanced"
|
|
||||||
type="bool"/>
|
|
||||||
|
|
||||||
<!-- Fonts -->
|
<!-- Fonts -->
|
||||||
<preference id="font.language.group"
|
<preference id="font.language.group"
|
||||||
|
@ -50,20 +44,6 @@
|
||||||
oncommand="gContentPane.showPopupExceptions();"
|
oncommand="gContentPane.showPopupExceptions();"
|
||||||
accesskey="&popupExceptions.accesskey;"/>
|
accesskey="&popupExceptions.accesskey;"/>
|
||||||
</row>
|
</row>
|
||||||
<row id="enableJavaScriptRow">
|
|
||||||
<vbox align="start">
|
|
||||||
<checkbox id="enableJavaScript" preference="javascript.enabled"
|
|
||||||
label="&enableJavaScript.label;" accesskey="&enableJavaScript.accesskey;"
|
|
||||||
onsyncfrompreference="return gContentPane.updateButtons('advancedJSButton',
|
|
||||||
'javascript.enabled');"/>
|
|
||||||
</vbox>
|
|
||||||
<vbox>
|
|
||||||
<button id="advancedJSButton" label="&advancedJS.label;"
|
|
||||||
accesskey="&advancedJS.accesskey;"
|
|
||||||
oncommand="gContentPane.showAdvancedJS();"
|
|
||||||
preference="pref.advanced.javascript.disable_button.advanced"/>
|
|
||||||
</vbox>
|
|
||||||
</row>
|
|
||||||
</rows>
|
</rows>
|
||||||
</grid>
|
</grid>
|
||||||
</groupbox>
|
</groupbox>
|
||||||
|
|
|
@ -9,7 +9,6 @@ browser.jar:
|
||||||
content/browser/preferences/aboutPermissions.xml
|
content/browser/preferences/aboutPermissions.xml
|
||||||
* content/browser/preferences/advanced.xul
|
* content/browser/preferences/advanced.xul
|
||||||
* content/browser/preferences/advanced.js
|
* content/browser/preferences/advanced.js
|
||||||
content/browser/preferences/advanced-scripts.xul
|
|
||||||
content/browser/preferences/applications.xul
|
content/browser/preferences/applications.xul
|
||||||
* content/browser/preferences/applications.js
|
* content/browser/preferences/applications.js
|
||||||
content/browser/preferences/applicationManager.xul
|
content/browser/preferences/applicationManager.xul
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
<!-- 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/. -->
|
|
||||||
|
|
||||||
<!ENTITY advancedJSDialog.title "Advanced JavaScript Settings">
|
|
||||||
<!ENTITY window.width "37em">
|
|
||||||
|
|
||||||
<!ENTITY allowScripts.label "Allow scripts to:">
|
|
||||||
|
|
||||||
<!ENTITY moveResizePopupWindows.label "Move or resize popup windows">
|
|
||||||
<!ENTITY moveResizePopupWindows.accesskey "M">
|
|
||||||
<!ENTITY raiseLowerWindows.label "Raise or lower windows">
|
|
||||||
<!ENTITY raiseLowerWindows.accesskey "R">
|
|
||||||
<!ENTITY disableContextMenus.label "Disable or replace context menus">
|
|
||||||
<!ENTITY disableContextMenus.accesskey "D">
|
|
|
@ -7,15 +7,6 @@
|
||||||
<!ENTITY popupExceptions.label "Exceptions…">
|
<!ENTITY popupExceptions.label "Exceptions…">
|
||||||
<!ENTITY popupExceptions.accesskey "E">
|
<!ENTITY popupExceptions.accesskey "E">
|
||||||
|
|
||||||
<!ENTITY enableJavaScript.label "Enable JavaScript">
|
|
||||||
<!ENTITY enableJavaScript.accesskey "J">
|
|
||||||
<!ENTITY advancedJS.label "Advanced…">
|
|
||||||
<!ENTITY advancedJS.accesskey "v">
|
|
||||||
|
|
||||||
<!ENTITY enableJava.label "Enable Java">
|
|
||||||
<!ENTITY enableJava.accesskey "n">
|
|
||||||
|
|
||||||
|
|
||||||
<!ENTITY fontsAndColors.label "Fonts & Colors">
|
<!ENTITY fontsAndColors.label "Fonts & Colors">
|
||||||
|
|
||||||
<!ENTITY defaultFont.label "Default font:">
|
<!ENTITY defaultFont.label "Default font:">
|
||||||
|
|
|
@ -89,7 +89,6 @@
|
||||||
locale/browser/preferences/aboutPermissions.dtd (%chrome/browser/preferences/aboutPermissions.dtd)
|
locale/browser/preferences/aboutPermissions.dtd (%chrome/browser/preferences/aboutPermissions.dtd)
|
||||||
locale/browser/preferences/aboutPermissions.properties (%chrome/browser/preferences/aboutPermissions.properties)
|
locale/browser/preferences/aboutPermissions.properties (%chrome/browser/preferences/aboutPermissions.properties)
|
||||||
locale/browser/preferences/advanced.dtd (%chrome/browser/preferences/advanced.dtd)
|
locale/browser/preferences/advanced.dtd (%chrome/browser/preferences/advanced.dtd)
|
||||||
locale/browser/preferences/advanced-scripts.dtd (%chrome/browser/preferences/advanced-scripts.dtd)
|
|
||||||
locale/browser/preferences/applicationManager.dtd (%chrome/browser/preferences/applicationManager.dtd)
|
locale/browser/preferences/applicationManager.dtd (%chrome/browser/preferences/applicationManager.dtd)
|
||||||
locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties)
|
locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties)
|
||||||
locale/browser/preferences/colors.dtd (%chrome/browser/preferences/colors.dtd)
|
locale/browser/preferences/colors.dtd (%chrome/browser/preferences/colors.dtd)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче