mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-12-12 17:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed drag-and-drop regression when updating Firefox 145.0, b=no-bug, c=folders

Browse Source
This commit is contained in:
mr. m
2025-11-13 20:33:35 +01:00
parent 609aa386f0
commit 9e899f1d8a
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/browser/components/tabbrowser/content/drag-and-drop-js.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/drag-and-drop.js b/browser/components/tabbrowser/content/drag-and-drop.js diff --git a/browser/components/tabbrowser/content/drag-and-drop.js b/browser/components/tabbrowser/content/drag-and-drop.js
index c97c661656868bc7faaf7c66c9702eea056aafe1..aa9f0ed071e4898cac2b98a4d81e95df6a41b8dd 100644 index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812307b9a04 100644
--- a/browser/components/tabbrowser/content/drag-and-drop.js --- a/browser/components/tabbrowser/content/drag-and-drop.js
+++ b/browser/components/tabbrowser/content/drag-and-drop.js +++ b/browser/components/tabbrowser/content/drag-and-drop.js
@@ -32,6 +32,9 @@ @@ -32,6 +32,9 @@
@@ -149,8 +149,8 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..aa9f0ed071e4898cac2b98a4d81e95df
this.#tabbrowserTabs.verticalMode && this.#tabbrowserTabs.verticalMode &&
- tab.pinned && - tab.pinned &&
- this.#tabbrowserTabs.hasAttribute("expanded") && - this.#tabbrowserTabs.hasAttribute("expanded") &&
+ (tab.hasAttribute("zen-essential")) && + tab.hasAttribute("zen-essential") &&
+ (this.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) && + (this.#tabbrowserTabs.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) &&
!this.#tabbrowserTabs.expandOnHover !this.#tabbrowserTabs.expandOnHover
); );
} }

5
src/zen/folders/ZenFolders.mjs
View File

@@ -1156,10 +1156,7 @@
let dragDownThreshold = let dragDownThreshold =
Services.prefs.getIntPref('zen.view.drag-and-drop.drop-inside-lower-threshold') / 100; Services.prefs.getIntPref('zen.view.drag-and-drop.drop-inside-lower-threshold') / 100;
const dropElementGroup = dropElement.group; const dropElementGroup = dropElement;
if (!dropElementGroup) {
return { dropElement, colorCode, dropBefore };
}
const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group'); const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group');
let firstGroupElem = let firstGroupElem =
dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling; dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling;