diff options
| -rw-r--r-- | helpers/DATA/firefox/gnu/enable-js-options.patch | 310 | ||||
| -rw-r--r-- | helpers/DATA/firefox/patches/enable-js-options.patch | 304 | ||||
| -rw-r--r-- | helpers/DATA/firefox/patches/hack-manifest-packaging.patch | 17 | ||||
| -rw-r--r-- | helpers/DATA/firefox/trisquel/enable-js-options.patch | 310 |
4 files changed, 321 insertions, 620 deletions
diff --git a/helpers/DATA/firefox/gnu/enable-js-options.patch b/helpers/DATA/firefox/gnu/enable-js-options.patch deleted file mode 100644 index 9cca7a9..0000000 --- a/helpers/DATA/firefox/gnu/enable-js-options.patch +++ /dev/null @@ -1,310 +0,0 @@ -# HG changeset patch -# User Gijs Kruitbosch <gijskruitbosch@gmail.com> -# Date 1365155574 -7200 -# Node ID 444b9baa31d6065d37edbd61a2dcb892c989e0e2 -# Parent 99121d529b47ec285d61f64988335e60ac120cf7 -Bug 851702 - Remove JS load and advanced preferences from the UI - -diff --git a/browser/components/preferences/advanced-scripts.xul b/browser/components/preferences/advanced-scripts.xul -deleted file mode 100644 ---- a/browser/components/preferences/advanced-scripts.xul -+++ /dev/null -@@ -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> -diff --git a/browser/components/preferences/content.xul b/browser/components/preferences/content.xul ---- a/browser/components/preferences/content.xul -+++ b/browser/components/preferences/content.xul -@@ -17,23 +17,18 @@ - - <prefpane id="paneContent" - onpaneload="gContentPane.init();" - helpTopic="prefs-content"> - - <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" - name="font.language.group" - type="wstring" - onchange="gContentPane._rebuildFonts();"/> - </preferences> - -@@ -56,30 +51,16 @@ - label="&blockPopups.label;" accesskey="&blockPopups.accesskey;" - onsyncfrompreference="return gContentPane.updateButtons('popupPolicyButton', - 'dom.disable_open_during_load');"/> - </vbox> - <button id="popupPolicyButton" label="&popupExceptions.label;" - 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> - - <!-- Fonts and Colors --> - <groupbox id="fontsGroup"> - <caption label="&fontsAndColors.label;"/> - -diff --git a/browser/components/preferences/in-content/content.xul b/browser/components/preferences/in-content/content.xul ---- a/browser/components/preferences/in-content/content.xul -+++ b/browser/components/preferences/in-content/content.xul -@@ -1,24 +1,18 @@ - <!-- 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/. --> - - <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" - name="font.language.group" - type="wstring" - onchange="gContentPane._rebuildFonts();"/> - </preferences> - -@@ -45,30 +39,16 @@ - label="&blockPopups.label;" accesskey="&blockPopups.accesskey;" - onsyncfrompreference="return gContentPane.updateButtons('popupPolicyButton', - 'dom.disable_open_during_load');"/> - </vbox> - <button id="popupPolicyButton" label="&popupExceptions.label;" - 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> - - <!-- Fonts and Colors --> - <groupbox id="fontsGroup" data-category="paneContent" hidden="true"> - <caption label="&fontsAndColors.label;"/> - -diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn ---- a/browser/components/preferences/jar.mn -+++ b/browser/components/preferences/jar.mn -@@ -4,17 +4,16 @@ - - 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/advanced-scripts.xul - content/browser/preferences/applications.xul - * content/browser/preferences/applications.js - content/browser/preferences/applicationManager.xul - * content/browser/preferences/applicationManager.js - * content/browser/preferences/colors.xul - * content/browser/preferences/cookies.xul - content/browser/preferences/cookies.js - content/browser/preferences/content.xul -diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd -deleted file mode 100644 ---- a/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd -+++ /dev/null -@@ -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"> -diff --git a/browser/locales/en-US/chrome/browser/preferences/content.dtd b/browser/locales/en-US/chrome/browser/preferences/content.dtd ---- a/browser/locales/en-US/chrome/browser/preferences/content.dtd -+++ b/browser/locales/en-US/chrome/browser/preferences/content.dtd -@@ -2,25 +2,16 @@ - - 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 blockPopups.label "Block pop-up windows"> - <!ENTITY blockPopups.accesskey "B"> - <!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 & Colors"> - - <!ENTITY defaultFont.label "Default font:"> - <!ENTITY defaultFont.accesskey "D"> - <!ENTITY defaultSize.label "Size:"> - <!ENTITY defaultSize.accesskey "S"> - - <!ENTITY advancedFonts.label "Advanced…"> -diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn ---- a/browser/locales/jar.mn -+++ b/browser/locales/jar.mn -@@ -81,17 +81,16 @@ - #endif - locale/browser/feeds/subscribe.dtd (%chrome/browser/feeds/subscribe.dtd) - locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) - locale/browser/migration/migration.dtd (%chrome/browser/migration/migration.dtd) - locale/browser/migration/migration.properties (%chrome/browser/migration/migration.properties) - 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) - locale/browser/preferences/cookies.dtd (%chrome/browser/preferences/cookies.dtd) - locale/browser/preferences/content.dtd (%chrome/browser/preferences/content.dtd) - locale/browser/preferences/connection.dtd (%chrome/browser/preferences/connection.dtd) - locale/browser/preferences/applications.dtd (%chrome/browser/preferences/applications.dtd) - locale/browser/preferences/fonts.dtd (%chrome/browser/preferences/fonts.dtd) ---- a/browser/components/preferences/content.js 2014-04-28 01:52:01.000000000 +0200 -+++ b/browser/components/preferences/content.js 2014-05-07 17:02:34.000000000 +0200 -@@ -57,18 +57,7 @@ - "chrome://browser/content/preferences/permissions.xul", - "", params); - }, -- -- // 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 - ---- a/browser/components/preferences/in-content/content.js 2014-05-07 17:01:48.000000000 +0200 -+++ b/browser/components/preferences/in-content/content.js 2014-04-28 01:52:01.000000000 +0200 -@@ -58,18 +58,6 @@ - "Browser:Permissions", "resizable=yes", params); - }, - -- // 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 - - /** diff --git a/helpers/DATA/firefox/patches/enable-js-options.patch b/helpers/DATA/firefox/patches/enable-js-options.patch new file mode 100644 index 0000000..2ba6cb8 --- /dev/null +++ b/helpers/DATA/firefox/patches/enable-js-options.patch @@ -0,0 +1,304 @@ +# revert https://bug851702.bugzilla.mozilla.org/attachment.cgi?id=733785 + +# HG changeset patch +# User Gijs Kruitbosch <gijskruitbosch@gmail.com> +# Date 1365155574 -7200 +# Node ID 444b9baa31d6065d37edbd61a2dcb892c989e0e2 +# Parent 99121d529b47ec285d61f64988335e60ac120cf7 +Bug 851702 - Remove JS load and advanced preferences from the UI + +--- b/browser/components/preferences/content.xul ++++ a/browser/components/preferences/content.xul +@@ -17,18 +17,23 @@ + + <prefpane id="paneContent" + onpaneload="gContentPane.init();" + helpTopic="prefs-content"> + + <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" + name="font.language.group" + type="wstring" + onchange="gContentPane._rebuildFonts();"/> + </preferences> + +@@ -51,16 +56,30 @@ + label="&blockPopups.label;" accesskey="&blockPopups.accesskey;" + onsyncfrompreference="return gContentPane.updateButtons('popupPolicyButton', + 'dom.disable_open_during_load');"/> + </vbox> + <button id="popupPolicyButton" label="&popupExceptions.label;" + 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> + + <!-- Fonts and Colors --> + <groupbox id="fontsGroup"> + <caption label="&fontsAndColors.label;"/> + +--- b/browser/components/preferences/in-content/content.xul ++++ a/browser/components/preferences/in-content/content.xul +@@ -1,18 +1,24 @@ + <!-- 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/. --> + + <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" + name="font.language.group" + type="wstring" + onchange="gContentPane._rebuildFonts();"/> + </preferences> + +@@ -39,16 +45,30 @@ + label="&blockPopups.label;" accesskey="&blockPopups.accesskey;" + onsyncfrompreference="return gContentPane.updateButtons('popupPolicyButton', + 'dom.disable_open_during_load');"/> + </vbox> + <button id="popupPolicyButton" label="&popupExceptions.label;" + 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> + + <!-- Fonts and Colors --> + <groupbox id="fontsGroup" data-category="paneContent" hidden="true"> + <caption label="&fontsAndColors.label;"/> + +--- b/browser/components/preferences/jar.mn ++++ a/browser/components/preferences/jar.mn +@@ -4,16 +4,17 @@ + + 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/advanced-scripts.xul + content/browser/preferences/applications.xul + * content/browser/preferences/applications.js + content/browser/preferences/applicationManager.xul + * content/browser/preferences/applicationManager.js + * content/browser/preferences/colors.xul + * content/browser/preferences/cookies.xul + content/browser/preferences/cookies.js + content/browser/preferences/content.xul +--- b/browser/locales/en-US/chrome/browser/preferences/content.dtd ++++ a/browser/locales/en-US/chrome/browser/preferences/content.dtd +@@ -2,16 +2,25 @@ + - 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 blockPopups.label "Block pop-up windows"> + <!ENTITY blockPopups.accesskey "B"> + <!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 & Colors"> + + <!ENTITY defaultFont.label "Default font:"> + <!ENTITY defaultFont.accesskey "D"> + <!ENTITY defaultSize.label "Size:"> + <!ENTITY defaultSize.accesskey "S"> + + <!ENTITY advancedFonts.label "Advanced…"> +--- b/browser/locales/jar.mn ++++ a/browser/locales/jar.mn +@@ -81,16 +81,17 @@ + #endif + locale/browser/feeds/subscribe.dtd (%chrome/browser/feeds/subscribe.dtd) + locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) + locale/browser/migration/migration.dtd (%chrome/browser/migration/migration.dtd) + locale/browser/migration/migration.properties (%chrome/browser/migration/migration.properties) + 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) + locale/browser/preferences/cookies.dtd (%chrome/browser/preferences/cookies.dtd) + locale/browser/preferences/content.dtd (%chrome/browser/preferences/content.dtd) + locale/browser/preferences/connection.dtd (%chrome/browser/preferences/connection.dtd) + locale/browser/preferences/applications.dtd (%chrome/browser/preferences/applications.dtd) + locale/browser/preferences/fonts.dtd (%chrome/browser/preferences/fonts.dtd) +--- b/browser/components/preferences/content.js 2014-05-07 17:02:34.000000000 +0200 ++++ a/browser/components/preferences/content.js 2014-04-28 01:52:01.000000000 +0200 +@@ -57,7 +57,18 @@ + "chrome://browser/content/preferences/permissions.xul", + "", params); + }, ++ ++ // 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 + +--- b/browser/components/preferences/in-content/content.js 2014-04-28 01:52:01.000000000 +0200 ++++ a/browser/components/preferences/in-content/content.js 2014-05-07 17:01:48.000000000 +0200 +@@ -58,6 +58,18 @@ + "Browser:Permissions", "resizable=yes", params); + }, + ++ // 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 + + /** +diff --git a/browser/components/preferences/advanced-scripts.xul b/browser/components/preferences/advanced-scripts.xul +--- /dev/null ++++ a/browser/components/preferences/advanced-scripts.xul +@@ -0,0 +1,46 @@ ++<?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> +--- /dev/null ++++ a/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd +@@ -0,0 +1,15 @@ ++<!-- 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"> diff --git a/helpers/DATA/firefox/patches/hack-manifest-packaging.patch b/helpers/DATA/firefox/patches/hack-manifest-packaging.patch new file mode 100644 index 0000000..5cede80 --- /dev/null +++ b/helpers/DATA/firefox/patches/hack-manifest-packaging.patch @@ -0,0 +1,17 @@ +# Hack allowing to bundle whole unpacked extensions without their manifests +# breaking the packaging process. + +--- a/python/mozbuild/mozpack/packager/__init__.py 2014-10-04 19:03:00.000000000 +0000 ++++ b/python/mozbuild/mozpack/packager/__init__.py 2014-10-06 12:07:03.000000000 +0000 +@@ -246,7 +246,10 @@ + ''' + assert not self._closed + if is_manifest(path): +- self._add_manifest_file(path, file) ++ if "chrome.manifest" in path and "extensions" in path: ++ self._file_queue.append(self.formatter.add, path, file) ++ else: ++ self._add_manifest_file(path, file) + elif path.endswith('.xpt'): + self._queue.append(self.formatter.add_interfaces, path, file) + else: diff --git a/helpers/DATA/firefox/trisquel/enable-js-options.patch b/helpers/DATA/firefox/trisquel/enable-js-options.patch deleted file mode 100644 index 9cca7a9..0000000 --- a/helpers/DATA/firefox/trisquel/enable-js-options.patch +++ /dev/null @@ -1,310 +0,0 @@ -# HG changeset patch -# User Gijs Kruitbosch <gijskruitbosch@gmail.com> -# Date 1365155574 -7200 -# Node ID 444b9baa31d6065d37edbd61a2dcb892c989e0e2 -# Parent 99121d529b47ec285d61f64988335e60ac120cf7 -Bug 851702 - Remove JS load and advanced preferences from the UI - -diff --git a/browser/components/preferences/advanced-scripts.xul b/browser/components/preferences/advanced-scripts.xul -deleted file mode 100644 ---- a/browser/components/preferences/advanced-scripts.xul -+++ /dev/null -@@ -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> -diff --git a/browser/components/preferences/content.xul b/browser/components/preferences/content.xul ---- a/browser/components/preferences/content.xul -+++ b/browser/components/preferences/content.xul -@@ -17,23 +17,18 @@ - - <prefpane id="paneContent" - onpaneload="gContentPane.init();" - helpTopic="prefs-content"> - - <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" - name="font.language.group" - type="wstring" - onchange="gContentPane._rebuildFonts();"/> - </preferences> - -@@ -56,30 +51,16 @@ - label="&blockPopups.label;" accesskey="&blockPopups.accesskey;" - onsyncfrompreference="return gContentPane.updateButtons('popupPolicyButton', - 'dom.disable_open_during_load');"/> - </vbox> - <button id="popupPolicyButton" label="&popupExceptions.label;" - 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> - - <!-- Fonts and Colors --> - <groupbox id="fontsGroup"> - <caption label="&fontsAndColors.label;"/> - -diff --git a/browser/components/preferences/in-content/content.xul b/browser/components/preferences/in-content/content.xul ---- a/browser/components/preferences/in-content/content.xul -+++ b/browser/components/preferences/in-content/content.xul -@@ -1,24 +1,18 @@ - <!-- 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/. --> - - <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" - name="font.language.group" - type="wstring" - onchange="gContentPane._rebuildFonts();"/> - </preferences> - -@@ -45,30 +39,16 @@ - label="&blockPopups.label;" accesskey="&blockPopups.accesskey;" - onsyncfrompreference="return gContentPane.updateButtons('popupPolicyButton', - 'dom.disable_open_during_load');"/> - </vbox> - <button id="popupPolicyButton" label="&popupExceptions.label;" - 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> - - <!-- Fonts and Colors --> - <groupbox id="fontsGroup" data-category="paneContent" hidden="true"> - <caption label="&fontsAndColors.label;"/> - -diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn ---- a/browser/components/preferences/jar.mn -+++ b/browser/components/preferences/jar.mn -@@ -4,17 +4,16 @@ - - 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/advanced-scripts.xul - content/browser/preferences/applications.xul - * content/browser/preferences/applications.js - content/browser/preferences/applicationManager.xul - * content/browser/preferences/applicationManager.js - * content/browser/preferences/colors.xul - * content/browser/preferences/cookies.xul - content/browser/preferences/cookies.js - content/browser/preferences/content.xul -diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd -deleted file mode 100644 ---- a/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd -+++ /dev/null -@@ -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"> -diff --git a/browser/locales/en-US/chrome/browser/preferences/content.dtd b/browser/locales/en-US/chrome/browser/preferences/content.dtd ---- a/browser/locales/en-US/chrome/browser/preferences/content.dtd -+++ b/browser/locales/en-US/chrome/browser/preferences/content.dtd -@@ -2,25 +2,16 @@ - - 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 blockPopups.label "Block pop-up windows"> - <!ENTITY blockPopups.accesskey "B"> - <!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 & Colors"> - - <!ENTITY defaultFont.label "Default font:"> - <!ENTITY defaultFont.accesskey "D"> - <!ENTITY defaultSize.label "Size:"> - <!ENTITY defaultSize.accesskey "S"> - - <!ENTITY advancedFonts.label "Advanced…"> -diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn ---- a/browser/locales/jar.mn -+++ b/browser/locales/jar.mn -@@ -81,17 +81,16 @@ - #endif - locale/browser/feeds/subscribe.dtd (%chrome/browser/feeds/subscribe.dtd) - locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) - locale/browser/migration/migration.dtd (%chrome/browser/migration/migration.dtd) - locale/browser/migration/migration.properties (%chrome/browser/migration/migration.properties) - 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) - locale/browser/preferences/cookies.dtd (%chrome/browser/preferences/cookies.dtd) - locale/browser/preferences/content.dtd (%chrome/browser/preferences/content.dtd) - locale/browser/preferences/connection.dtd (%chrome/browser/preferences/connection.dtd) - locale/browser/preferences/applications.dtd (%chrome/browser/preferences/applications.dtd) - locale/browser/preferences/fonts.dtd (%chrome/browser/preferences/fonts.dtd) ---- a/browser/components/preferences/content.js 2014-04-28 01:52:01.000000000 +0200 -+++ b/browser/components/preferences/content.js 2014-05-07 17:02:34.000000000 +0200 -@@ -57,18 +57,7 @@ - "chrome://browser/content/preferences/permissions.xul", - "", params); - }, -- -- // 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 - ---- a/browser/components/preferences/in-content/content.js 2014-05-07 17:01:48.000000000 +0200 -+++ b/browser/components/preferences/in-content/content.js 2014-04-28 01:52:01.000000000 +0200 -@@ -58,18 +58,6 @@ - "Browser:Permissions", "resizable=yes", params); - }, - -- // 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 - - /** |