1
1
diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
2
- index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e492783860a67c28 100644
2
+ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..738502d7c0dd9336a48270249818861dcdff9c1a 100644
3
3
--- a/browser/base/content/browser-sidebar.js
4
4
+++ b/browser/base/content/browser-sidebar.js
5
5
@@ -11,6 +11,9 @@ var SidebarUI = {
@@ -74,17 +74,17 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
74
74
]));
75
75
},
76
76
77
- @@ -63,6 +98,10 @@ var SidebarUI = {
77
+ @@ -62,6 +97,10 @@ var SidebarUI = {
78
+ },
78
79
POSITION_START_PREF: "sidebar.position_start",
79
80
DEFAULT_SIDEBAR_ID: "viewBookmarksSidebar",
80
-
81
+ +
81
82
+ SIDEBAR_KEEP_TABS_ACTIVE_PREF: "pulse.sidebar.keeptabsactive.enabled",
82
83
+ SIDEBAR_TABS_PREF: "pulse.sidebar.enabled",
83
84
+ SIDEBAR_EXTENSIONS_PREF: "pulse.sidebar.extensions.enabled",
84
- +
85
+
85
86
// lastOpenedId is set in show() but unlike currentID it's not cleared out on hide
86
87
// and isn't persisted across windows
87
- lastOpenedId: null,
88
88
@@ -83,6 +122,15 @@ var SidebarUI = {
89
89
_switcherArrow: null,
90
90
_inited: false,
@@ -101,7 +101,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
101
101
/**
102
102
* @type {MutationObserver | null}
103
103
*/
104
- @@ -112,20 +160,80 @@ var SidebarUI = {
104
+ @@ -112,20 +160,79 @@ var SidebarUI = {
105
105
this.toggleSwitcherPanel();
106
106
});
107
107
@@ -176,14 +176,13 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
176
176
if (!enumerator.hasMoreElements()) {
177
177
let xulStore = Services.xulStore;
178
178
- xulStore.persist(this._box, "sidebarcommand");
179
- +
180
179
+ if (!this._keepTabsActivePref) {
181
180
+ xulStore.persist(this._box, "sidebarcommand");
182
181
+ }
183
182
184
183
if (this._box.hasAttribute("positionend")) {
185
184
xulStore.persist(this._box, "positionend");
186
- @@ -157,7 +265 ,7 @@ var SidebarUI = {
185
+ @@ -157,7 +264 ,7 @@ var SidebarUI = {
187
186
/**
188
187
* The handler for Services.obs.addObserver.
189
188
**/
@@ -192,7 +191,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
192
191
switch (topic) {
193
192
case "intl:app-locales-changed": {
194
193
if (this.isOpen) {
195
- @@ -168,6 +276 ,54 @@ var SidebarUI = {
194
+ @@ -168,6 +275 ,54 @@ var SidebarUI = {
196
195
this.showInitially(this.lastOpenedId);
197
196
break;
198
197
}
@@ -247,16 +246,16 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
247
246
}
248
247
}
249
248
},
250
- @@ -284,17 +440 ,32 @@ var SidebarUI = {
249
+ @@ -284,17 +439 ,32 @@ var SidebarUI = {
251
250
// First reset all ordinals to match DOM ordering.
252
251
let browser = document.getElementById("browser");
253
252
[...browser.children].forEach((node, i) => {
254
253
+ // Do not change ordinal on vertical tabs
255
254
+ if (node.id == "TabsToolbar" || node.id == "verticaltabs-splitter") {
256
255
+ return;
257
256
+ }
258
- +
259
- node.style.MozBoxOrdinalGroup = i + 1;
257
+ +
258
+ node.style.order = i + 1;
260
259
});
261
260
262
261
if (!this._positionStart) {
@@ -271,21 +270,21 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
271
270
+
272
271
+ // sidebar-container and appcontent
273
272
let appcontent = document.getElementById("appcontent");
274
- - let boxOrdinal = this._box.style.MozBoxOrdinalGroup;
275
- - this._box.style.MozBoxOrdinalGroup = appcontent.style.MozBoxOrdinalGroup;
276
- + let boxOrdinal = this._sidebarTabs.style.MozBoxOrdinalGroup;
277
- + this._sidebarTabs.style.MozBoxOrdinalGroup =
278
- + appcontent.style.MozBoxOrdinalGroup;
279
- appcontent.style.MozBoxOrdinalGroup = boxOrdinal;
273
+ - let boxOrdinal = this._box.style.order;
274
+ - this._box.style.order = appcontent.style.order;
275
+ + let boxOrdinal = this._sidebarTabs.style.order;
276
+ + this._sidebarTabs.style.order = appcontent.style.order;
277
+ appcontent.style.order = boxOrdinal;
280
278
+
281
279
+ // splitter and sidebar-box
282
- + const splitterBoxOrdinal = this._splitter.style.MozBoxOrdinalGroup;
283
- + this._splitter.style.MozBoxOrdinalGroup = this._box.style.MozBoxOrdinalGroup;
284
- + this._box.style.MozBoxOrdinalGroup = splitterBoxOrdinal;
280
+ + const splitterBoxOrdinal = this._splitter.style.order;
281
+ + this._splitter.style.order = this._box.style.order;
282
+ + this._box.style.order = splitterBoxOrdinal;
283
+ +
285
284
// Indicate we've switched ordering to the box
286
285
this._box.setAttribute("positionend", true);
287
286
} else {
288
- @@ -483,6 +654 ,10 @@ var SidebarUI = {
287
+ @@ -483,6 +653 ,10 @@ var SidebarUI = {
289
288
},
290
289
291
290
_loadSidebarExtension(commandID) {
@@ -296,23 +295,23 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
296
295
let sidebar = this.sidebars.get(commandID);
297
296
let { extensionId } = sidebar;
298
297
if (extensionId) {
299
- @@ -521,6 +696 ,7 @@ var SidebarUI = {
298
+ @@ -521,6 +695 ,7 @@ var SidebarUI = {
300
299
}
301
300
302
301
this._fireFocusedEvent();
303
302
+ this.loadedSidebars.push(commandID);
304
303
return true;
305
304
});
306
305
},
307
- @@ -544,6 +720 ,7 @@ var SidebarUI = {
306
+ @@ -544,6 +719 ,7 @@ var SidebarUI = {
308
307
}
309
308
return this._show(commandID).then(() => {
310
309
this._loadSidebarExtension(commandID);
311
310
+ this.loadedSidebars.push(commandID);
312
311
return true;
313
312
});
314
313
},
315
- @@ -557,6 +734 ,38 @@ var SidebarUI = {
314
+ @@ -557,6 +733 ,38 @@ var SidebarUI = {
316
315
*/
317
316
_show(commandID) {
318
317
return new Promise(resolve => {
@@ -347,11 +346,11 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
347
346
+ browser.setAttribute("hidden", "true");
348
347
+ }
349
348
+ }
350
- +
349
+ +
351
350
this.selectMenuItem(commandID);
352
351
353
352
this._box.hidden = this._splitter.hidden = false;
354
- @@ -574,7 +783 ,13 @@ var SidebarUI = {
353
+ @@ -574,7 +782 ,13 @@ var SidebarUI = {
355
354
this.observeTitleChanges(sourceL10nEl);
356
355
this.browser.setAttribute("src", url); // kick off async load
357
356
@@ -366,29 +365,25 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
366
365
this.browser.addEventListener(
367
366
"load",
368
367
event => {
369
- @@ -618,12 +833,19 @@ var SidebarUI = {
368
+ @@ -618,11 +832,14 @@ var SidebarUI = {
370
369
// create a new content viewer because the old one doesn't get destroyed
371
370
// until about:blank has loaded (which does not happen as long as the
372
371
// element is hidden).
373
372
- this.browser.setAttribute("src", "about:blank");
374
373
- this.browser.docShell.createAboutBlankContentViewer(null, null);
374
+ -
375
375
+ if (!this._keepTabsActivePref) {
376
376
+ this.browser.setAttribute("src", "about:blank");
377
377
+ this.browser.docShell.createAboutBlankContentViewer(null, null);
378
378
+ }
379
-
379
+ +
380
380
this._box.removeAttribute("checked");
381
381
this._box.hidden = this._splitter.hidden = true;
382
382
+ this._sidebarIcons.removeAttribute("checked");
383
383
384
- + // Note: This was was commented out but had no description for its removed
385
- + // reason. I am bringing it back unless there is any other justification - tricky
386
- + //
387
- + // Removed in: :mute: Remove Test Logs
388
384
let selBrowser = gBrowser.selectedBrowser;
389
385
selBrowser.focus();
390
- if (triggerNode) {
391
- @@ -636,10 +858,27 @@ var SidebarUI = {
386
+ @@ -636,10 +853,28 @@ var SidebarUI = {
392
387
* none if the argument is an empty string.
393
388
*/
394
389
selectMenuItem(commandID) {
@@ -405,6 +400,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
405
400
- let triggerbutton =
406
401
+ let dropdownTriggerButton =
407
402
triggerButtonId && document.getElementById(triggerButtonId);
403
+ +
408
404
+ const sidebarTriggerButton = document.getElementById(
409
405
+ `sidebar-background-${id}`
410
406
+ );
@@ -417,7 +413,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
417
413
if (id == commandID) {
418
414
menu.setAttribute("checked", "true");
419
415
if (triggerbutton) {
420
- @@ -655,6 +894 ,107 @@ var SidebarUI = {
416
+ @@ -655,6 +890 ,107 @@ var SidebarUI = {
421
417
}
422
418
}
423
419
},
0 commit comments