wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 851702 - Remove JS load and advanced preferences from the UI, r=gavin

Browse Source
This commit is contained in:
Gijs Kruitbosch 2013-04-05 11:52:54 +02:00
parent 8257a56ede
commit 79c4674bc5
9 changed files with 2 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
browser/components/preferences/advanced-scripts.xul
View File

@ -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>

13
browser/components/preferences/content.js
View File

@ -61,8 +61,6 @@ var gContentPane = {
*
* dom.disable_open_during_load
* - true if popups are blocked by default, false otherwise
* javascript.enabled
* - true if JavaScript is enabled, false otherwise
*/
// POP-UPS
@ -76,17 +74,6 @@ var gContentPane = {
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

21
browser/components/preferences/content.xul
View File

@ -22,13 +22,8 @@
<preferences id="contentPreferences">
<!--XXX buttons prefs -->
<!-- POPUPS, JAVASCRIPT -->
<!-- POPUPS -->
<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 -->
<preference id="font.language.group"
@ -61,20 +56,6 @@
oncommand="gContentPane.showPopupExceptions();"
accesskey="&popupExceptions.accesskey;"/>
</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>
</grid>
</groupbox>

14
browser/components/preferences/in-content/content.js
View File

@ -61,8 +61,6 @@ var gContentPane = {
*
* dom.disable_open_during_load
* - true if popups are blocked by default, false otherwise
* javascript.enabled
* - true if JavaScript is enabled, false otherwise
*/
// POP-UPS
@ -76,18 +74,6 @@ var gContentPane = {
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
/**

22
browser/components/preferences/in-content/content.xul
View File

@ -4,16 +4,10 @@
<preferences id="contentPreferences">
<!-- Popups and JavaScript -->
<!-- Popups -->
<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 -->
<preference id="font.language.group"
@ -50,20 +44,6 @@
oncommand="gContentPane.showPopupExceptions();"
accesskey="&popupExceptions.accesskey;"/>
</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>
</grid>
</groupbox>

1
browser/components/preferences/jar.mn
View File

@ -9,7 +9,6 @@ browser.jar:
content/browser/preferences/aboutPermissions.xml
* content/browser/preferences/advanced.xul
* content/browser/preferences/advanced.js
content/browser/preferences/advanced-scripts.xul
content/browser/preferences/applications.xul
* content/browser/preferences/applications.js
content/browser/preferences/applicationManager.xul

15
browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd
View File

@ -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">

9
browser/locales/en-US/chrome/browser/preferences/content.dtd
View File

@ -7,15 +7,6 @@
<!ENTITY popupExceptions.label "Exceptions…">
<!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 &amp; Colors">
<!ENTITY defaultFont.label "Default font:">

1
browser/locales/jar.mn
View File

@ -89,7 +89,6 @@
locale/browser/preferences/aboutPermissions.dtd (%chrome/browser/preferences/aboutPermissions.dtd)
locale/browser/preferences/aboutPermissions.properties (%chrome/browser/preferences/aboutPermissions.properties)
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.properties (%chrome/browser/preferences/applicationManager.properties)
locale/browser/preferences/colors.dtd (%chrome/browser/preferences/colors.dtd)