mirror of
https://github.com/zen-browser/desktop.git
synced 2026-05-20 03:51:20 +00:00
no-bug: Sync upstream Firefox to version 150.0.1 (gh-13472)
This commit is contained in:
@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
|
||||
|
||||
### Firefox Versions
|
||||
|
||||
- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0`! 🚀
|
||||
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0`!
|
||||
- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0.1`! 🚀
|
||||
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0.1`!
|
||||
|
||||
### Contributing
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
fb55808f9cdd2172649e551705008af4f98038fe
|
||||
e097b3c5ca4139a5b88052379a776782e078356b
|
||||
@@ -952,6 +952,7 @@
|
||||
// Sometimes, dragend doesn't always get called when dragging
|
||||
// to different windows, see gh-8643.
|
||||
delete ownerGlobal.gZenCompactModeManager._isTabBeingDragged;
|
||||
ownerGlobal.gZenCompactModeManager._clearAllHoverStates();
|
||||
}
|
||||
this.clearSpaceSwitchTimer();
|
||||
gZenFolders.highlightGroupOnDragOver(null);
|
||||
@@ -1107,7 +1108,10 @@
|
||||
);
|
||||
for (let i = startIndex; i <= endIndex; i++) {
|
||||
let item = items[i];
|
||||
if (!movingTabs.includes(item)) {
|
||||
if (
|
||||
!movingTabs.includes(item) &&
|
||||
!(isTabGroupLabel(item) && i == startIndex)
|
||||
) {
|
||||
tabsInBetween.push(item);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -664,7 +664,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
|
||||
) {
|
||||
let newIndex = dropIndex;
|
||||
let fromDifferentWindow = false;
|
||||
movingTabs = Array.from(movingTabs || draggedTab)
|
||||
let ownedTabs = Array.from(movingTabs || draggedTab)
|
||||
.reverse()
|
||||
.map(tab => {
|
||||
if (!gBrowser.isTab(tab)) {
|
||||
@@ -700,6 +700,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
|
||||
}
|
||||
return tab;
|
||||
});
|
||||
movingTabs = [...ownedTabs];
|
||||
if (fromDifferentWindow) {
|
||||
gBrowser.addRangeToMultiSelectedTabs(
|
||||
gBrowser.tabContainer.dragAndDropElements[dropIndex],
|
||||
@@ -822,7 +823,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
|
||||
} catch (ex) {
|
||||
console.error("Error moving tabs:", ex);
|
||||
}
|
||||
return [draggedTab, movingTabs];
|
||||
return [draggedTab, ownedTabs];
|
||||
}
|
||||
|
||||
onLocationChange(aBrowser, aWebProgress, aRequest, aLocationURI) {
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
"binaryName": "zen",
|
||||
"version": {
|
||||
"product": "firefox",
|
||||
"version": "150.0",
|
||||
"candidate": "150.0",
|
||||
"version": "150.0.1",
|
||||
"candidate": "150.0.1",
|
||||
"candidateBuild": 1
|
||||
},
|
||||
"buildOptions": {
|
||||
|
||||
Reference in New Issue
Block a user