Skip to content

back button: Enable returning to server tab from Settings #1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Paperyduke6 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

back button: Enable returning to server tab from Settings #1506

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion app/renderer/js/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export class ServerManagerView {
$fullscreenPopup: Element;
loading: Set<string>;
activeTabIndex: number;
previousActiveTabIndex: number;
tabs: ServerOrFunctionalTab[];
functionalTabs: Map<TabPage, number>;
tabIndex: number;
Expand Down Expand Up @@ -129,6 +130,7 @@ export class ServerManagerView {

this.loading = new Set();
this.activeTabIndex = -1;
this.previousActiveTabIndex = -1;
this.tabs = [];
this.presetOrgs = [];
this.functionalTabs = new Map();
Expand Down Expand Up @@ -467,7 +469,12 @@ export class ServerManagerView {
});
this.$backButton.addEventListener("click", async () => {
const tab = this.tabs[this.activeTabIndex];
if (tab instanceof ServerTab) (await tab.webview).back();
if (tab instanceof ServerTab) {
(await tab.webview).back();
} else if (this.previousActiveTabIndex >= 0) {
await this.activateTab(this.previousActiveTabIndex);
this.previousActiveTabIndex = -1;
}
});

this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip, true);
Expand Down Expand Up @@ -700,12 +707,24 @@ export class ServerManagerView {
try {
(await tab.webview).canGoBackButton();
} catch {}
} else if (
(this.previousActiveTabIndex >= 0 &&
this.tabs[this.previousActiveTabIndex]) ||
this.activeTabIndex >= 0
) {
document
.querySelector("#actions-container #back-action")!
.classList.remove("disable");
} else {
document
.querySelector("#actions-container #back-action")!
.classList.add("disable");
}

if (tab.properties.role === "function" && this.activeTabIndex >= 0) {
this.previousActiveTabIndex = this.activeTabIndex;
}

this.activeTabIndex = index;
await tab.activate();

Expand Down
Loading