1
1
diff --git a/browser/base/content/tabbrowser-tabs.js b/browser/base/content/tabbrowser-tabs.js
2
- index 06c2479886f0e3a7c5ba6d8d939a2c1f0f19442d..7169efb6fbf88071bfb45cacc138b5203c334738 100644
2
+ index 06c2479886f0e3a7c5ba6d8d939a2c1f0f19442d..6426d849d2afa12e123f8a1811aeb16515448158 100644
3
3
--- a/browser/base/content/tabbrowser-tabs.js
4
4
+++ b/browser/base/content/tabbrowser-tabs.js
5
- @@ -513,19 +513,40 @@
5
+ @@ -168,7 +168,14 @@
6
+ }
7
+
8
+ on_transitionend(event) {
9
+ - if (event.propertyName != "max-width") {
10
+ + const verticalTabs = Services.prefs.getBoolPref(
11
+ + "pulse.tabs.vertical",
12
+ + false
13
+ + );
14
+ +
15
+ + // NOTE: Vertical tabs use max-height instead of max-width to animate on
16
+ + // open / close
17
+ + if ((!verticalTabs && event.propertyName != "max-width") || (!verticalTabs && event.propertyName != "max-height")) {
18
+ return;
19
+ }
20
+
21
+ @@ -513,19 +520,40 @@
6
22
}
7
23
dt.setDragImage(toDrag, dragImageOffset, dragImageOffset);
8
24
@@ -44,7 +60,7 @@ index 06c2479886f0e3a7c5ba6d8d939a2c1f0f19442d..7169efb6fbf88071bfb45cacc138b520
44
60
movingTabs: (tab.multiselected ? gBrowser.selectedTabs : [tab]).filter(
45
61
t => t.pinned == tab.pinned
46
62
),
47
- @@ -612,21 +633 ,31 @@
63
+ @@ -612,21 +640 ,31 @@
48
64
}
49
65
}
50
66
@@ -81,7 +97,7 @@ index 06c2479886f0e3a7c5ba6d8d939a2c1f0f19442d..7169efb6fbf88071bfb45cacc138b520
81
97
];
82
98
}
83
99
newMargin = pixelsToScroll > 0 ? maxMargin : minMargin;
84
- @@ -635,30 +666 ,40 @@
100
+ @@ -635,30 +673 ,40 @@
85
101
let children = this.allTabs;
86
102
if (newIndex == children.length) {
87
103
let tabRect = this._getVisibleTabs().at(-1).getBoundingClientRect();
@@ -130,7 +146,7 @@ index 06c2479886f0e3a7c5ba6d8d939a2c1f0f19442d..7169efb6fbf88071bfb45cacc138b520
130
146
var dt = event.dataTransfer;
131
147
var dropEffect = dt.dropEffect;
132
148
var draggedTab;
133
- @@ -715,7 +756 ,7 @@
149
+ @@ -715,7 +763 ,7 @@
134
150
incrementDropIndex = false;
135
151
}
136
152
@@ -139,7 +155,7 @@ index 06c2479886f0e3a7c5ba6d8d939a2c1f0f19442d..7169efb6fbf88071bfb45cacc138b520
139
155
for (let tab of movingTabs) {
140
156
tab.setAttribute("tabdrop-samewindow", "true");
141
157
tab.style.transform = "translateX(" + newTranslateX + "px)";
142
- @@ -1485,19 +1526 ,33 @@
158
+ @@ -1485,19 +1533 ,33 @@
143
159
}
144
160
}
145
161
@@ -179,7 +195,7 @@ index 06c2479886f0e3a7c5ba6d8d939a2c1f0f19442d..7169efb6fbf88071bfb45cacc138b520
179
195
180
196
let pinned = draggedTab.pinned;
181
197
let numPinned = gBrowser._numPinnedTabs;
182
- @@ -1506,36 +1561 ,40 @@
198
+ @@ -1506,36 +1568 ,40 @@
183
199
pinned ? numPinned : undefined
184
200
);
185
201
@@ -231,7 +247,7 @@ index 06c2479886f0e3a7c5ba6d8d939a2c1f0f19442d..7169efb6fbf88071bfb45cacc138b520
231
247
}
232
248
233
249
draggedTab._dragData.translateX = translateX;
234
- @@ -1568,11 +1627 ,11 @@
250
+ @@ -1568,11 +1634 ,11 @@
235
251
if (tabs[mid] == draggedTab && ++mid > high) {
236
252
break;
237
253
}
@@ -245,7 +261,7 @@ index 06c2479886f0e3a7c5ba6d8d939a2c1f0f19442d..7169efb6fbf88071bfb45cacc138b520
245
261
tabCenter
246
262
) {
247
263
low = mid + 1;
248
- @@ -1595,16 +1654 ,16 @@
264
+ @@ -1595,16 +1661 ,16 @@
249
265
for (let tab of tabs) {
250
266
if (tab != draggedTab) {
251
267
let shift = getTabShift(tab, newIndex);
0 commit comments