eliott/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop synced 2026-04-25 17:15:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

gh-13364: Fixed split out context menu showing wrong label (gh-13365)

Browse Source
This commit is contained in:
mr. m
2026-04-23 10:25:27 +02:00
committed by GitHub
parent 26c907bb39
commit 05af15d70a
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@@ -11,7 +11,7 @@
"devDependencies": {
"@babel/preset-typescript": "^7.27.0",
"@zen-browser/prettier": "^3.9.3",
"@zen-browser/surfer": "^1.14.5",
"@zen-browser/surfer": "^1.14.6",
"formal-git": "^1.2.9",
"globals": "^16.3.0",
"husky": "^9.1.7",
@@ -868,9 +868,9 @@
}
},
"node_modules/@zen-browser/surfer": {
"version": "1.14.5",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.14.5.tgz",
"integrity": "sha512-VLvYuM1y86Hqux5GDcPwU7FIx2ADbpumnNyO3NI5mK3DtUB8jULPXbhzEtB8qnnRLiQ86yxyPf9ONT28/7FZCg==",
"version": "1.14.6",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.14.6.tgz",
"integrity": "sha512-hgTKadIJ/9/9dizHn4229ZZHQckd7D4OR6e7HVkcmtuq1Jke3OAn6SH7u7NjvzvYy35Mb2sXjVUvZEG1ITIfgg==",
"dev": true,
"license": "MPL-2.0",
"dependencies": {

2
package.json
View File

@@ -47,7 +47,7 @@
"devDependencies": {
"@babel/preset-typescript": "^7.27.0",
"@zen-browser/prettier": "^3.9.3",
"@zen-browser/surfer": "^1.14.5",
"@zen-browser/surfer": "^1.14.6",
"formal-git": "^1.2.9",
"globals": "^16.3.0",
"husky": "^9.1.7",

14
src/zen/common/ZenPreloadedScripts.js
View File

@@ -22,6 +22,7 @@
"chrome://browser/content/zen-components/ZenFolders.mjs",
"chrome://browser/content/zen-components/ZenEmojiPicker.mjs",
"chrome://browser/content/zen-components/ZenLiveFoldersUI.mjs",
"chrome://browser/content/zen-components/ZenDownloadAnimation.mjs",
];
for (let script of scripts) {
@@ -30,7 +31,6 @@
let customZenElements = [
["zen-folder", "chrome://browser/content/zen-components/ZenFolder.mjs"],
["zen-download-animation", "chrome://browser/content/zen-components/ZenDownloadAnimation.mjs"],
["zen-workspace-creation", "resource:///modules/zen/ZenSpaceCreation.mjs"],
["zen-workspace", "resource:///modules/zen/ZenSpace.mjs"],
["zen-workspace-icons", "resource:///modules/zen/ZenSpaceIcons.mjs"]
@@ -43,12 +43,12 @@
// used before DOMContentLoaded it will be imported and upgraded when
// registering the customElements.setElementCreationCallback().
for (let [tag, script] of customZenElements) {
customElements.setElementCreationCallback(
tag,
function customElementCreationCallback() {
ChromeUtils.importESModule(script, { global: "current" });
}
);
customElements.setElementCreationCallback(
tag,
function customElementCreationCallback() {
ChromeUtils.importESModule(script, { global: "current" });
}
);
}
},
{ once: true }

10
src/zen/split-view/ZenViewSplitter.mjs
View File

@@ -1166,7 +1166,10 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
insetUpdateContextMenuItems() {
const contentAreaContextMenu = document.getElementById("tabContextMenu");
contentAreaContextMenu.addEventListener("popupshowing", () => {
let contextTab = TabContextMenu.contextTab || gBrowser.selectedTab;
let contextTab = TabContextMenu.contextTab;
if (!contextTab) {
return;
}
let selectedTabs = contextTab.multiselected
? gBrowser.selectedTabs
: [contextTab];
@@ -1249,6 +1252,11 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
let currentTab = TabContextMenu.contextTab || gBrowser.selectedTab;
if (currentTab.multiselected) {
tabs = gBrowser.selectedTabs;
} else if (!currentTab.selected) {
tabs = [
currentTab,
...gBrowser.selectedTabs.filter(t => t !== currentTab),
];
} else {
tabs = [currentTab];
}