Skip to content

Commit 0278aea

Browse files
committed
chore: Remove support links that target mozilla's support page on the about dialog, b=(bug #8634), c=no-component
1 parent 3c01004 commit 0278aea

File tree

3 files changed

+35
-10
lines changed

3 files changed

+35
-10
lines changed

src/browser/base/content/aboutDialog-js.patch

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js
2-
index f6e1391baf12abb91c85a95107bb3923118746c0..76c7b75a4e29056110f1631a50047c4ddd8b1f4a 100644
2+
index f6e1391baf12abb91c85a95107bb3923118746c0..cac04aa288e8a305d0c8b28e0c919abce87658e5 100644
33
--- a/browser/base/content/aboutDialog.js
44
+++ b/browser/base/content/aboutDialog.js
55
@@ -52,7 +52,7 @@ function init() {
@@ -20,3 +20,18 @@ index f6e1391baf12abb91c85a95107bb3923118746c0..76c7b75a4e29056110f1631a50047c4d
2020
versionIdKey += "-nightly";
2121
let buildID = Services.appinfo.appBuildID;
2222
let year = buildID.slice(0, 4);
23+
@@ -125,14 +125,6 @@ function init() {
24+
window.close();
25+
});
26+
if (AppConstants.MOZ_UPDATER) {
27+
- document
28+
- .getElementById("aboutDialogHelpLink")
29+
- .addEventListener("click", () => {
30+
- openHelpLink("firefox-help");
31+
- });
32+
- document
33+
- .getElementById("submit-feedback")
34+
- .addEventListener("click", openFeedbackPage);
35+
document
36+
.getElementById("checkForUpdatesButton")
37+
.addEventListener("command", () => {

src/browser/base/content/aboutDialog-xhtml.patch

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
2-
index c64980810570fcea84e33fdc2d66ac42a79f4e46..b7198e810a7510fa82cc6801cfd01c88a08d42c1 100644
2+
index c64980810570fcea84e33fdc2d66ac42a79f4e46..6ef9bf4b88f0a0539d833f662c4dd890fd1fde93 100644
33
--- a/browser/base/content/aboutDialog.xhtml
44
+++ b/browser/base/content/aboutDialog.xhtml
55
@@ -35,6 +35,7 @@
@@ -10,20 +10,29 @@ index c64980810570fcea84e33fdc2d66ac42a79f4e46..b7198e810a7510fa82cc6801cfd01c88
1010
</linkset>
1111

1212
<html:div id="aboutDialogContainer">
13-
@@ -125,21 +126,23 @@
13+
@@ -102,10 +103,6 @@
14+
<label id="version" class="update"/>
15+
<label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>
16+
</hbox>
17+
- <description class="text-blurb">
18+
- <label id="aboutDialogHelpLink" is="text-link" data-l10n-id="aboutdialog-help-user"/>
19+
- <label id="submit-feedback" is="text-link" data-l10n-id="aboutdialog-submit-feedback"/>
20+
- </description>
21+
</vbox>
22+
#endif
23+
</hbox>
24+
@@ -125,21 +122,17 @@
1425
</description>
1526
</vbox>
1627
<description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
1728
- <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-mozillaLink"/>
1829
+ <label is="text-link" href="https://github.com/zen-browser/desktop" data-l10n-name="community-mozillaLink"/>
1930
<label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>
2031
</description>
21-
+#if 0
22-
<description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
23-
<label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
24-
<label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
25-
</description>
26-
+#endif
32+
- <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
33+
- <label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
34+
- <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
35+
- </description>
2736
</vbox>
2837
</vbox>
2938
</hbox>

src/browser/themes/shared/zen-icons/icons.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@
286286
list-style-image: url('home.svg') !important;
287287
}
288288

289-
#toggle_toolbar-menubar {
289+
#toggle_toolbar-menubar,
290+
#appMenu_menu_openHelp {
290291
display: none;
291292
}
292293

0 commit comments

Comments
 (0)