Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit e8b3def

Browse files
PressJumpPressJump
authored
Merge collapsing-sidebar
Collapsing sidebar
2 parents f6602ff + 3874cc7 commit e8b3def

File tree

14 files changed

+98
-24
lines changed

14 files changed

+98
-24
lines changed

‎.flagged‎

Whitespace-only changes.

‎.github/workflows/alpha.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,3 +431,7 @@ jobs:
431431
commit_user_name: Fushra Robot
432432
commit_user_email: [email protected]
433433
repository: .
434+
commit_message: 📦 Upload flatpak for ${{ needs.build-data.outputs.version }}
435+
commit_user_name: Fushra Robot
436+
commit_user_email: [email protected]
437+
repository: ./repo

‎src/browser/app/profile/firefox-js.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,16 @@ index 14ecab77149f5645e24c8bffff57c223f64730bb..875b78dbd027dc18debf10281733cd8c
7575

7676
pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds)
7777
pref("browser.engagement.downloads-button.has-used", false);
78+
.mozilla.org");
79+
80+
// Discovery prefs
81+
-pref("browser.discovery.enabled", true);
82+
-pref("browser.discovery.containers.enabled", true);
83+
-pref("browser.discovery.sites", "addons.mozilla.org");
84+
+//
85+
+// From memory, these connect to Google Analytics, so they are a no go
86+
+pref("browser.discovery.enabled", false);
87+
+pref("browser.discovery.containers.enabled", false);
88+
89+
pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds)
90+
pref("browser.engagement.downloads-button.has-used", false);

‎src/browser/app/profile/pulse-browser.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,10 @@ pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS");
5757
pref("extensions.pocket.enabled", false);
5858

5959
#include better-fox.js
60+
RL", "https://discord.gg/Y3khyEtAgS");
61+
pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS");
62+
63+
// This pref needs to be here to not break context menus (GH#169)
64+
pref("extensions.pocket.enabled", false);
65+
66+
#include better-fox.js

‎src/browser/base/content/browser-verticaltabs.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// @ts-check
55

66
const VERTICAL_TABS_POSITION = 'pulse.tabs.vertical'
7+
const VERTICAL_TABS_COLLAPSE = 'pulse.tabs.vertical.collapse'
78

89
var VerticalTabs = {
910
/**
@@ -34,6 +35,13 @@ var VerticalTabs = {
3435
return document.getElementById('browser')
3536
},
3637

38+
/**
39+
* @return {Boolean}
40+
*/
41+
get browserCollapseTabs() {
42+
return Services.prefs.getBoolPref(VERTICAL_TABS_COLLAPSE, false)
43+
},
44+
3745
/** @type {HTMLElement?} */
3846
arrowScrollbox: null,
3947
/** @type {HTMLElement?} */
@@ -70,6 +78,10 @@ var VerticalTabs = {
7078
document
7179
.querySelector('#TabsToolbar .toolbar-items')
7280
?.setAttribute('align', 'start')
81+
82+
document
83+
.getElementById('TabsToolbar')
84+
?.setAttribute('collapse', this.browserCollapseTabs ? 'true' : 'false')
7385
},
7486

7587
disableVerticalTabs() {
@@ -99,6 +111,15 @@ var VerticalTabs = {
99111
this.disableVerticalTabs()
100112
}
101113
}
114+
if (data === VERTICAL_TABS_COLLAPSE) {
115+
document
116+
.getElementById('TabsToolbar')
117+
?.setAttribute(
118+
'collapse',
119+
this.browserCollapseTabs ? 'true' : 'false'
120+
)
121+
}
122+
102123
break
103124
}
104125
},

‎src/browser/components/customizableui/CustomizableUI-jsm.patch‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ index e97c979363775d2de999e65e7e41c02a736f57ac..501f1235ac9ba571be66b533772cc259
4040
"downloads-button",
4141
AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
4242
"fxa-toolbar-menu-button",
43+
V_EDITION ? "developer-button" : null,
44+
"fxa-toolbar-menu-button",

‎src/browser/components/preferences/main-inc-xhtml.patch‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
2-
index fdf515554d67c5082b0d9c73b72533e06a085030..ed381af1294c5ce0bcc1d87be32e931e904821dc 100644
2+
index a9a1511a8da36140be93264effe683e5d5007f11..839ba020d4b2b4e5672f357377840bb2dd9362e9 100644
33
--- a/browser/components/preferences/main.inc.xhtml
44
+++ b/browser/components/preferences/main.inc.xhtml
5-
@@ -61,6 +61,10 @@
5+
@@ -61,6 +61,14 @@
66
hidden="true">
77
<label><html:h2 data-l10n-id="tabs-group-header"/></label>
88

9-
+ <checkbox id="verticalTabsGroup"
10-
+ preference="pulse.tabs.vertical"
11-
+ data-l10n-id="preferences-vertical-tabs-enabled"/>
9+
+ <checkbox id="verticalTabsGroup" data-l10n-id="preferences-vertical-tabs-enabled"
10+
+ preference="pulse.tabs.vertical" />
11+
+
12+
+ <vbox class="indent">
13+
+ <checkbox id="verticalTabsCollapse" preference="pulse.tabs.vertical.collapse"
14+
+ data-l10n-id="preferences-vertical-tabs-collapse" />
15+
+ </vbox>
1216
+
1317
<checkbox id="ctrlTabRecentlyUsedOrder" data-l10n-id="ctrl-tab-recently-used-order"
1418
preference="browser.ctrlTab.sortByRecentlyUsed"/>
1519

16-
@@ -122,6 +126,22 @@
20+
@@ -122,6 +130,22 @@
1721
<html:h1 data-l10n-id="language-and-appearance-header"/>
1822
</hbox>
1923

‎src/browser/components/preferences/main-js.patch‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
2-
index 1ce4ba85a0df22b4176443c9003669577b6a230c..a582693e2b7e6fd1e150d25f51c9f578065ce14c 100644
2+
index 1ce4ba85a0df22b4176443c9003669577b6a230c..7447e19c3ddf2d40fe87ffcd945fdb5c00bd3e97 100644
33
--- a/browser/components/preferences/main.js
44
+++ b/browser/components/preferences/main.js
5-
@@ -161,6 +161,12 @@ Preferences.addAll([
5+
@@ -161,6 +161,13 @@ Preferences.addAll([
66

77
// Media
88
{ id: "media.hardwaremediakeys.enabled", type: "bool" },
99
+
10-
+
1110
+ // Pulse browser: custom settings
12-
+ { id: 'pulse.sidebar.enabled', type: 'bool' },
13-
+ { id: 'pulse.sidebar.keeptabsactive.enabled', type: 'bool' },
14-
+ { id: 'pulse.tabs.vertical', type: 'bool' }
11+
+ { id: "pulse.sidebar.enabled", type: "bool" },
12+
+ { id: "pulse.sidebar.keeptabsactive.enabled", type: "bool" },
13+
+
14+
+ { id: "pulse.tabs.vertical", type: "bool" },
15+
+ { id: "pulse.tabs.vertical.collapse", type: "bool" },
1516
]);
1617

1718
if (AppConstants.HAVE_SHELL_SERVICE) {

‎src/browser/locales/en-US/browser/preferences/preferences-ftl.patch‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
2-
index d7b87eacb425cb277e226261c7d994e084100a5d..92db46705e11eeb3aa77d1e9d901ebf01b799e91 100644
2+
index f24485700321defc69cd57099ede164701b9b3ec..c62c09a76a96a8fd443537146edf4461839135f4 100644
33
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
44
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
5-
@@ -1424,3 +1424,15 @@ httpsonly-radio-disabled =
5+
@@ -1432,3 +1432,18 @@ httpsonly-radio-disabled =
66
desktop-folder-name = Desktop
77
downloads-folder-name = Downloads
88
choose-download-folder-title = Choose Download Folder:
@@ -11,10 +11,13 @@ index d7b87eacb425cb277e226261c7d994e084100a5d..92db46705e11eeb3aa77d1e9d901ebf0
1111
+preferences-sidebar-header = Sidebar
1212
+preferences-sidebar-visible =
1313
+ .label = Show sidebar tabs
14-
+preferences-vertical-tabs-enabled =
15-
+ .label = Use vertical tabs (Early Access)
16-
+preferences-sidebar-extensions-visible =
17-
+ .label = Show available extensions on the sidebar
1814
+preferences-sidebar-active-tabs =
1915
+ .label = Keep sidebar tabs active even when closed
2016
+preferences-sidebar-active-tabs-description = When enabled, sidebar tabs will remain active even when closed. When disabled, sidebar tabs will be closed when you click on another tab.
17+
+
18+
+preferences-vertical-tabs-enabled =
19+
+ .label = Use vertical tabs (Early Access)
20+
+preferences-vertical-tabs-collapse =
21+
+ .label = Collapse tabs
22+
+
23+
+

‎src/browser/themes/addons/dark/manifest-json.patch‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ index 3ab1378a042996445ec77c8cad46b0fc44604d70..24cb568177ad3b68ad31785595073287
1111
"description": "A theme with a dark color scheme.",
1212
"author": "Mozilla",
1313
"version": "1.2",
14+
"tab_text": "rgb(251,251,254)",
15+
"icons": "rgb(251,251,254)",
16+
"frame": "#1c1b22",

0 commit comments

Comments
 (0)