mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-08 00:10:00 +02:00
fix: Fixed tabs not loading at startup, b=(closes #8147), c=workspaces
This commit is contained in:
parent
f2e188a86c
commit
d80ba6b058
2 changed files with 10 additions and 7 deletions
|
@ -808,9 +808,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
|||
delete this._initialTab;
|
||||
} else if (this._tabToRemoveForEmpty) {
|
||||
if (gZenVerticalTabsManager._canReplaceNewTab) {
|
||||
console.log(this._tabToSelect)
|
||||
if (this._tabToSelect) {
|
||||
gBrowser.tabbox.selectedIndex = this._tabToSelect;
|
||||
if (typeof this._tabToSelect === 'number') {
|
||||
setTimeout(() => {
|
||||
gBrowser.tabbox.selectedIndex = this._tabToSelect;
|
||||
delete this._tabToSelect;
|
||||
}, 0);
|
||||
} else {
|
||||
this.selectEmptyTab();
|
||||
showed = true;
|
||||
|
@ -821,7 +823,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
|||
});
|
||||
}
|
||||
}
|
||||
delete this._tabToSelect;
|
||||
delete this._tabToRemoveForEmpty;
|
||||
if (gZenVerticalTabsManager._canReplaceNewTab && showed) {
|
||||
BrowserCommands.openTab();
|
||||
|
@ -1815,7 +1816,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
|||
async _performWorkspaceChange(workspace, { onInit = false, alwaysChange = false, whileScrolling = false } = {}) {
|
||||
const previousWorkspace = await this.getActiveWorkspace();
|
||||
alwaysChange = alwaysChange || onInit;
|
||||
|
||||
this.activeWorkspace = workspace.uuid;
|
||||
if (previousWorkspace && previousWorkspace.uuid === workspace.uuid && !alwaysChange) {
|
||||
this._cancelSwipeAnimation();
|
||||
|
@ -2590,6 +2590,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
|||
// Switch workspace if needed
|
||||
if (workspaceID && workspaceID !== activeWorkspace.uuid && this._hasInitializedTabsStrip) {
|
||||
const workspaceToChange = this.getWorkspaceFromId(workspaceID);
|
||||
if (!workspaceToChange) {
|
||||
return;
|
||||
}
|
||||
await this.changeWorkspace(workspaceToChange);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
"brandShortName": "Zen",
|
||||
"brandFullName": "Zen Browser",
|
||||
"release": {
|
||||
"displayVersion": "1.12.2b",
|
||||
"displayVersion": "1.12.3b",
|
||||
"github": {
|
||||
"repo": "zen-browser/desktop"
|
||||
},
|
||||
|
@ -39,7 +39,7 @@
|
|||
"brandShortName": "Twilight",
|
||||
"brandFullName": "Zen Twilight",
|
||||
"release": {
|
||||
"displayVersion": "1.12.2t",
|
||||
"displayVersion": "1.12.3t",
|
||||
"github": {
|
||||
"repo": "zen-browser/desktop"
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue