Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Migration for disabling sidebar animations (#234)
- New tab button no longer follows OS style (#233, @surapunoyousei)

## 1.0.0-a.61
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"bs": "pnpm build && pnpm start",
"bus": "pnpm build:ui && pnpm start",
"start": "pnpm clearStartupCache && gluon run",
"start:win": "gluon run",
"export": "gluon export-file",
"imp": "gluon import",
"clearProfile": "rm -rf engine/obj-x86_64-pc-linux-gnu/tmp/profile-default",
Expand Down
29 changes: 16 additions & 13 deletions src/browser/base/content/browser-sidebar-js.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa361530fad 100644
index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e492783860a67c28 100644
--- a/browser/base/content/browser-sidebar.js
+++ b/browser/base/content/browser-sidebar.js
@@ -11,6 +11,9 @@ var SidebarUI = {
Expand Down Expand Up @@ -101,7 +101,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
/**
* @type {MutationObserver | null}
*/
@@ -112,20 +160,77 @@ var SidebarUI = {
@@ -112,20 +160,80 @@ var SidebarUI = {
this.toggleSwitcherPanel();
});

Expand Down Expand Up @@ -141,6 +141,9 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
+ this.createBrowser("sidebar");
+ }
+
+ // Temporary migration for 1.0.0-a.61
+ this._box.style.marginLeft = 'unset';
+
+ this.loadedSidebars = [];
+
this._inited = true;
Expand Down Expand Up @@ -180,7 +183,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3

if (this._box.hasAttribute("positionend")) {
xulStore.persist(this._box, "positionend");
@@ -157,7 +262,7 @@ var SidebarUI = {
@@ -157,7 +265,7 @@ var SidebarUI = {
/**
* The handler for Services.obs.addObserver.
**/
Expand All @@ -189,7 +192,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
switch (topic) {
case "intl:app-locales-changed": {
if (this.isOpen) {
@@ -168,6 +273,54 @@ var SidebarUI = {
@@ -168,6 +276,54 @@ var SidebarUI = {
this.showInitially(this.lastOpenedId);
break;
}
Expand Down Expand Up @@ -244,7 +247,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
}
}
},
@@ -284,17 +437,32 @@ var SidebarUI = {
@@ -284,17 +440,32 @@ var SidebarUI = {
// First reset all ordinals to match DOM ordering.
let browser = document.getElementById("browser");
[...browser.children].forEach((node, i) => {
Expand Down Expand Up @@ -282,7 +285,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
// Indicate we've switched ordering to the box
this._box.setAttribute("positionend", true);
} else {
@@ -483,6 +651,10 @@ var SidebarUI = {
@@ -483,6 +654,10 @@ var SidebarUI = {
},

_loadSidebarExtension(commandID) {
Expand All @@ -293,23 +296,23 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
let sidebar = this.sidebars.get(commandID);
let { extensionId } = sidebar;
if (extensionId) {
@@ -521,6 +693,7 @@ var SidebarUI = {
@@ -521,6 +696,7 @@ var SidebarUI = {
}

this._fireFocusedEvent();
+ this.loadedSidebars.push(commandID);
return true;
});
},
@@ -544,6 +717,7 @@ var SidebarUI = {
@@ -544,6 +720,7 @@ var SidebarUI = {
}
return this._show(commandID).then(() => {
this._loadSidebarExtension(commandID);
+ this.loadedSidebars.push(commandID);
return true;
});
},
@@ -557,6 +731,38 @@ var SidebarUI = {
@@ -557,6 +734,38 @@ var SidebarUI = {
*/
_show(commandID) {
return new Promise(resolve => {
Expand Down Expand Up @@ -348,7 +351,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
this.selectMenuItem(commandID);

this._box.hidden = this._splitter.hidden = false;
@@ -574,7 +780,13 @@ var SidebarUI = {
@@ -574,7 +783,13 @@ var SidebarUI = {
this.observeTitleChanges(sourceL10nEl);
this.browser.setAttribute("src", url); // kick off async load

Expand All @@ -363,7 +366,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
this.browser.addEventListener(
"load",
event => {
@@ -618,12 +830,19 @@ var SidebarUI = {
@@ -618,12 +833,19 @@ var SidebarUI = {
// create a new content viewer because the old one doesn't get destroyed
// until about:blank has loaded (which does not happen as long as the
// element is hidden).
Expand All @@ -385,7 +388,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
let selBrowser = gBrowser.selectedBrowser;
selBrowser.focus();
if (triggerNode) {
@@ -636,10 +855,27 @@ var SidebarUI = {
@@ -636,10 +858,27 @@ var SidebarUI = {
* none if the argument is an empty string.
*/
selectMenuItem(commandID) {
Expand Down Expand Up @@ -414,7 +417,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..5f840372c8c9bf366e98ee3646965aa3
if (id == commandID) {
menu.setAttribute("checked", "true");
if (triggerbutton) {
@@ -655,6 +891,107 @@ var SidebarUI = {
@@ -655,6 +894,107 @@ var SidebarUI = {
}
}
},
Expand Down