CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Abrowser updated for v32

Browse source
This commit is contained in:
Rubén Rodríguez 2014-10-01 12:01:34 +02:00
parent 68163c73e2
commit cce83006af
4 changed files with 261 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

42
helpers/DATA/firefox/abouthome/aboutHome.xhtml
View file

@ -27,6 +27,31 @@
href="chrome://browser/content/abouthome/aboutHome.css"/> href="chrome://browser/content/abouthome/aboutHome.css"/>
<style> <style>
label{
position:relative;
bottom:2px;
left:2px;
}
em {
color:#600
}
a{
color:#004998
}
.block-side-margin {
min-width: 16px;
-moz-box-flex: 1;
}
#block-horizontal-margin {
display: -moz-box;
-moz-box-flex: 1;
}
ul li { ul li {
list-style:none; list-style:none;
background:#ddd; background:#ddd;
@ -34,22 +59,32 @@ border-radius:3px;
padding:3px 5px 3px 5px; padding:3px 5px 3px 5px;
margin:5px; margin:5px;
box-shadow: 0px 2px 0 #ccc ; box-shadow: 0px 2px 0 #ccc ;
float:left;
} }
ul li a{ ul li a{
font-weight:bold; font-weight:bold;
color:#666; color:#666;
text-shadow:0px 1px 0px #fff; text-shadow:0px 1px 0px #fff;
} }
#trisquel a {
.titlelink {
font-weight:bold; font-weight:bold;
color:#56728C; color:#56728C;
text-shadow:0px 1px 0px #fff; text-shadow:0px 1px 0px #fff;
} }
#footer{
min-height:100px;
}
</style> </style>
</head> </head>
<body dir="&locale.dir;"> <body dir="&locale.dir;">
<div class="spacer"/> <div class="spacer"/>
<div id="topSection"> <div id="topSection">
<img src="chrome://branding/content/about-logo.png"/> <img src="chrome://branding/content/about-logo.png"/>
@ -67,8 +102,8 @@ text-shadow:0px 1px 0px #fff;
<div class="spacer"/> <div class="spacer"/>
<div style=" display: -moz-box; -moz-box-align: center; -moz-box-pack: center; width: 100%; background-color: hsla(0,0%,0%,.03); border-top: 1px solid hsla(0,0%,0%,.03); box-shadow: 0 2px 5px hsla(0,0%,0%,.1) inset, 0 -1px 0 hsla(0,0%,100%,.25);"> <div id="footer" style=" display: -moz-box; -moz-box-align: center; -moz-box-pack: center; width: 100%; background-color: hsla(0,0%,0%,.03); border-top: 1px solid hsla(0,0%,0%,.03); box-shadow: 0 2px 5px hsla(0,0%,0%,.1) inset, 0 -1px 0 hsla(0,0%,100%,.25);">
<p id="trisquel"><a href="https://trisquel.info">Trisquel GNU/Linux</a>:</p> <p ><a class="titlelink" href="https://trisquel.info">Trisquel GNU/Linux</a>:</p>
<ul style="font-size:0.8em"> <ul style="font-size:0.8em">
<li><a href="https://trisquel.info/forum">Forum</a></li> <li><a href="https://trisquel.info/forum">Forum</a></li>
<li><a href="https://trisquel.info/wiki">Wiki</a></li> <li><a href="https://trisquel.info/wiki">Wiki</a></li>
@ -79,3 +114,4 @@ text-shadow:0px 1px 0px #fff;
</body> </body>
</html> </html>

516
helpers/DATA/firefox/enable-js-options.patch
View file

@ -1,310 +1,232 @@
# HG changeset patch diff -ru firefox-32.0.3+build1.orig/browser/components/preferences/content.js firefox-32.0.3+build1/browser/components/preferences/content.js
# User Gijs Kruitbosch <gijskruitbosch@gmail.com> --- firefox-32.0.3+build1.orig/browser/components/preferences/content.js 2014-09-24 06:33:20.000000000 +0000
# Date 1365155574 -7200 +++ firefox-32.0.3+build1/browser/components/preferences/content.js 2014-09-30 13:03:48.000000000 +0000
# Node ID 444b9baa31d6065d37edbd61a2dcb892c989e0e2 @@ -69,7 +69,18 @@
# 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 &amp; 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", "chrome://browser/content/preferences/permissions.xul",
"", params); "", params);
}, },
- +
- // JAVASCRIPT + // JAVASCRIPT
- /** + /**
- * Displays the advanced JavaScript preferences for enabling or disabling + * Displays the advanced JavaScript preferences for enabling or disabling
- * various annoying behaviors. + * various annoying behaviors.
- */ + */
- showAdvancedJS: function () + showAdvancedJS: function ()
- { + {
- openDialog("chrome://browser/content/preferences/advanced-scripts.xul", + openDialog("chrome://browser/content/preferences/advanced-scripts.xul",
- "Browser:AdvancedScripts", null); + "Browser:AdvancedScripts", null);
- }, + },
// FONTS // FONTS
--- a/browser/components/preferences/in-content/content.js 2014-05-07 17:01:48.000000000 +0200 diff -ru firefox-32.0.3+build1.orig/browser/components/preferences/content.xul firefox-32.0.3+build1/browser/components/preferences/content.xul
+++ b/browser/components/preferences/in-content/content.js 2014-04-28 01:52:01.000000000 +0200 --- firefox-32.0.3+build1.orig/browser/components/preferences/content.xul 2014-09-24 06:33:20.000000000 +0000
@@ -58,18 +58,6 @@ +++ firefox-32.0.3+build1/browser/components/preferences/content.xul 2014-09-30 13:03:48.000000000 +0000
@@ -22,8 +22,13 @@
<preferences id="contentPreferences">
<!--XXX buttons prefs -->
- <!-- POPUPS -->
+ <!-- POPUPS, JAVASCRIPT -->
<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,6 +66,20 @@
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>
diff -ru firefox-32.0.3+build1.orig/browser/components/preferences/in-content/content.js firefox-32.0.3+build1/browser/components/preferences/in-content/content.js
--- firefox-32.0.3+build1.orig/browser/components/preferences/in-content/content.js 2014-09-24 06:33:20.000000000 +0000
+++ firefox-32.0.3+build1/browser/components/preferences/in-content/content.js 2014-09-30 13:03:48.000000000 +0000
@@ -70,6 +70,18 @@
"Browser:Permissions", "resizable=yes", params); "Browser:Permissions", "resizable=yes", params);
}, },
- // JAVASCRIPT + // JAVASCRIPT
- +
- /** + /**
- * Displays the advanced JavaScript preferences for enabling or disabling + * Displays the advanced JavaScript preferences for enabling or disabling
- * various annoying behaviors. + * various annoying behaviors.
- */ + */
- showAdvancedJS: function () + showAdvancedJS: function ()
- { + {
- openDialog("chrome://browser/content/preferences/advanced-scripts.xul", + openDialog("chrome://browser/content/preferences/advanced-scripts.xul",
- "Browser:AdvancedScripts", null); + "Browser:AdvancedScripts", null);
- }, + },
- +
// FONTS // FONTS
/** /**
diff -ru firefox-32.0.3+build1.orig/browser/components/preferences/in-content/content.xul firefox-32.0.3+build1/browser/components/preferences/in-content/content.xul
--- firefox-32.0.3+build1.orig/browser/components/preferences/in-content/content.xul 2014-09-24 06:33:20.000000000 +0000
+++ firefox-32.0.3+build1/browser/components/preferences/in-content/content.xul 2014-09-30 13:06:50.000000000 +0000
@@ -11,6 +11,15 @@
name="dom.disable_open_during_load"
type="bool"/>
+ <!-- JavaScript -->
+ <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"
@@ -56,6 +65,20 @@
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>
diff -ru firefox-32.0.3+build1.orig/browser/components/preferences/jar.mn firefox-32.0.3+build1/browser/components/preferences/jar.mn
--- firefox-32.0.3+build1.orig/browser/components/preferences/jar.mn 2014-09-24 06:33:20.000000000 +0000
+++ firefox-32.0.3+build1/browser/components/preferences/jar.mn 2014-09-30 13:03:48.000000000 +0000
@@ -9,6 +9,7 @@
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
diff -ru firefox-32.0.3+build1.orig/browser/locales/en-US/chrome/browser/preferences/content.dtd firefox-32.0.3+build1/browser/locales/en-US/chrome/browser/preferences/content.dtd
--- firefox-32.0.3+build1.orig/browser/locales/en-US/chrome/browser/preferences/content.dtd 2014-09-24 06:33:22.000000000 +0000
+++ firefox-32.0.3+build1/browser/locales/en-US/chrome/browser/preferences/content.dtd 2014-09-30 13:03:48.000000000 +0000
@@ -9,6 +9,15 @@
<!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:">
diff -ru firefox-32.0.3+build1.orig/browser/locales/jar.mn firefox-32.0.3+build1/browser/locales/jar.mn
--- firefox-32.0.3+build1.orig/browser/locales/jar.mn 2014-09-24 06:33:22.000000000 +0000
+++ firefox-32.0.3+build1/browser/locales/jar.mn 2014-09-30 13:03:48.000000000 +0000
@@ -103,6 +103,7 @@
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)
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">

4
helpers/make-firefox
View file

@ -24,7 +24,7 @@ VERSION=27
rm debian/control rm debian/control
# revert https://bug851702.bugzilla.mozilla.org/attachment.cgi?id=733785 # revert https://bug851702.bugzilla.mozilla.org/attachment.cgi?id=733785
patch -p1 -R < $DATA/enable-js-options.patch patch -p1 < $DATA/enable-js-options.patch
# js settings # js settings
cat $DATA/settings.js >> debian/vendor-firefox.js cat $DATA/settings.js >> debian/vendor-firefox.js
@ -39,7 +39,7 @@ cat << EOF >>services/healthreport/healthreport-prefs.js
pref("datareporting.healthreport.infoURL", "https://trisquel.info/legal"); pref("datareporting.healthreport.infoURL", "https://trisquel.info/legal");
EOF EOF
sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./modules/libpref/src/init/all.js ./browser/app/profile/firefox.js ./browser/base/content/aboutDialog.xul ./toolkit/content/aboutRights.xhtml sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./modules/libpref/src/init/all.js ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml
#sed 's%https://www.mozilla.org/firefox/central/%https://trisquel.info/browser%' -i browser/base/content/browser-appmenu.inc #sed 's%https://www.mozilla.org/firefox/central/%https://trisquel.info/browser%' -i browser/base/content/browser-appmenu.inc

2
makepackage
View file

@ -201,7 +201,7 @@ tmpmount(){
[ $MEM -lt 16000000 ] && return [ $MEM -lt 16000000 ] && return
grep jails/$UPSTREAM-$JAILARCH/tmp /proc/mounts -q && tmpumount grep jails/$UPSTREAM-$JAILARCH/tmp /proc/mounts -q && tmpumount
echo $PACKAGE | grep -q "linux" && return echo $PACKAGE | grep -q "linux" && return
mount -t tmpfs -o size=15G none jails/$UPSTREAM-$JAILARCH/tmp mount -t tmpfs -o size=20G none jails/$UPSTREAM-$JAILARCH/tmp
} }
compile(){ compile(){