Skip to content

Enable Sign out during initial FullPage capture #667

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

Merged
wikirby merged 1 commit into from
Jul 6, 2026
Merged

Enable Sign out during initial FullPage capture #667

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
12 changes: 4 additions & 8 deletions src/scripts/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,8 @@ let feedbackLabel = document.getElementById("feedback-label");
if (feedbackLabel) { feedbackLabel.textContent = strings.feedback; }
signoutLink.addEventListener("click", (e) => {
e.preventDefault();
// Stop any in-flight full-page capture so the worker's loop doesn't outlive the session.
abortCurrentCapture();
logFunnel(Funnel.Label.SignOut);
logSessionEnd(Session.EndTrigger.SignOut);
// Clear user context before new session — prevents next sign-in events from carrying old user's identity
Expand Down Expand Up @@ -949,9 +951,8 @@ async function fetchFreshNotebooks() {
logTelemetryEvent(getNotebooksEvent);
}
}
// Sign-out and Save lock until capture completes; mode buttons stay interactive.
// Save locks until capture completes; Sign-out stays available (it locks only during a save).
saveBtn.disabled = true;
disableSignout();
// Show initial capture progress (bar hidden until first drawCapture with viewport counts)
capturePanel.style.display = "flex";
statusText.textContent = strings.capturing;
Expand All @@ -962,7 +963,7 @@ if (isSignedIn) { setTimeout(function() { cancelBtn.focus(); }, 100); }

// Section selection persistence is handled by selectSection() in the custom dropdown

// --- Accessible signout disable/enable ---
// Signout is an <a> (no .disabled) so a11y state is toggled by hand; only ever driven by lock/unlockSidebar.
function disableSignout() {
signoutLink.style.pointerEvents = "none";
signoutLink.style.opacity = "0.4";
Expand Down Expand Up @@ -1058,7 +1059,6 @@ function switchToFullPage() {
statusText.textContent = strings.capturing;
saveBtn.disabled = true;
if (captureDimensions && !captureInProgress) {
disableSignout();
announceToScreenReader(strings.capturing);
let progressTrack = document.getElementById("progress-bar-track") as HTMLElement;
if (progressTrack) { progressTrack.style.display = "none"; }
Expand Down Expand Up @@ -2124,7 +2124,6 @@ function enterPdfMode(url: string) {
btn.setAttribute("aria-pressed", "false");
}
});
enableSignout();

// Show PDF options, hide capture panel
pdfOptionsPanel.style.display = "block";
Expand Down Expand Up @@ -2515,7 +2514,6 @@ function enterReadyStateWithoutCapture() {
(b as HTMLButtonElement).disabled = false;
b.classList.remove("disabled");
});
enableSignout();
announceToScreenReader(loc("WebClipper.Label.ClipSuccessful", "Capture complete"));
triggerInitialModeAutoEngage();
}
Expand Down Expand Up @@ -3000,7 +2998,6 @@ port.onMessage.addListener((message: any) => {
saveBtn.disabled = false;
}

enableSignout();
captureInProgress = false;
announceToScreenReader(loc("WebClipper.Label.ClipSuccessful", "Capture complete"));

Expand Down Expand Up @@ -3298,7 +3295,6 @@ port.onMessage.addListener((message: any) => {
currentMode = "fullpage";
// Unlock sidebar (clears disabled state from lockSidebar during save)
unlockSidebar();
enableSignout();
userEmailSpan.textContent = "";
userAuthType = "";
userInfoDiv.style.display = "none";
Expand Down
Loading