mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-10-04 08:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

Browse Source
This commit is contained in:
Mr. M
2025-10-02 23:43:19 +02:00
parent a576912e03 d6b7af889d
commit f35902c796
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/winsign/sign.ps1
View File

@@ -35,7 +35,9 @@ Start-Job -Name "SurferInit" -ScriptBlock {
param($PWD) param($PWD)
cd $PWD cd $PWD
npm run import -- --verbose npm run import -- --verbose
npm run surfer -- ci --brand release $surferJson = Get-Content surfer.json | ConvertFrom-Json
$version = $surferJson.brands.release.release.displayVersion
npm run ci -- $version
} -Verbose -ArgumentList $PWD -Debug } -Verbose -ArgumentList $PWD -Debug
echo "Downloading artifacts info" echo "Downloading artifacts info"

3
package.json
View File

@@ -31,7 +31,8 @@
"ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../", "ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../",
"lc": "surfer license-check", "lc": "surfer license-check",
"lc:fix": "surfer license-check --fix", "lc:fix": "surfer license-check --fix",
"use-moz-src": "cd engine && ./mach use-moz-src" "use-moz-src": "cd engine && ./mach use-moz-src",
"ci": "surfer ci --brand release --display-version"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

5
src/zen/workspaces/ZenWorkspaces.mjs
View File

@@ -2494,12 +2494,13 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
} }
for (const workspaceId of workspacesIds) { for (const workspaceId of workspacesIds) {
const workspaceElement = this.workspaceElement(workspaceId); const workspaceElement = this.workspaceElement(workspaceId);
if (!workspaceElement) { const workspaceObject = this.getWorkspaceFromId(workspaceId);
if (!workspaceElement || !workspaceObject) {
console.warn('Workspace element or object not found for id', workspaceId);
continue; continue;
} }
const arrowScrollbox = workspaceElement.tabsContainer; const arrowScrollbox = workspaceElement.tabsContainer;
const pinnedContainer = workspaceElement.pinnedTabsContainer; const pinnedContainer = workspaceElement.pinnedTabsContainer;
const workspaceObject = this.getWorkspaceFromId(workspaceId);
const essentialContainer = this.getEssentialsSection(workspaceObject.containerTabId); const essentialContainer = this.getEssentialsSection(workspaceObject.containerTabId);
const essentialNumChildren = essentialContainer.children.length; const essentialNumChildren = essentialContainer.children.length;
let essentialHackType = 0; let essentialHackType = 0;