facf38955c
There are a few things that need to be done, to make this work. First, we need to register `Enter` as another hotkey that opens the selected item. However, by default the `KeyboardHandler` will override all default actions. That might make sense for any other key, but for the `Enter` key, we want to keep the default behavior (i.e. follow a selected link or press a button). So for this single key event, we do not call `preventDefault()`. I see this as unproblematic for the following reasons. 1. With the changes from #2348, when we're in a list of items (articles, categories, feeds), there is no link selected. This is what made the `Enter` key work _implicitly_ in the past. With nothing selected, the `Enter` key will do nothing by default. 2. If we have **any** link selected (including when we are in a view with a list of selectable items), we'll get the default action of `Enter` (i.e. follow a link), which is exactly what we had before. Lastly, we need to update the list of keyboard shortcuts displayed when pressing `?`. This fixes #2366.
164 lines
7.1 KiB
JavaScript
164 lines
7.1 KiB
JavaScript
document.addEventListener("DOMContentLoaded", () => {
|
|
handleSubmitButtons();
|
|
|
|
if (!document.querySelector("body[data-disable-keyboard-shortcuts=true]")) {
|
|
let keyboardHandler = new KeyboardHandler();
|
|
keyboardHandler.on("g u", () => goToPage("unread"));
|
|
keyboardHandler.on("g b", () => goToPage("starred"));
|
|
keyboardHandler.on("g h", () => goToPage("history"));
|
|
keyboardHandler.on("g f", () => goToFeedOrFeeds());
|
|
keyboardHandler.on("g c", () => goToPage("categories"));
|
|
keyboardHandler.on("g s", () => goToPage("settings"));
|
|
keyboardHandler.on("ArrowLeft", () => goToPrevious());
|
|
keyboardHandler.on("ArrowRight", () => goToNext());
|
|
keyboardHandler.on("k", () => goToPrevious());
|
|
keyboardHandler.on("p", () => goToPrevious());
|
|
keyboardHandler.on("j", () => goToNext());
|
|
keyboardHandler.on("n", () => goToNext());
|
|
keyboardHandler.on("h", () => goToPage("previous"));
|
|
keyboardHandler.on("l", () => goToPage("next"));
|
|
keyboardHandler.on("z t", () => scrollToCurrentItem());
|
|
keyboardHandler.on("o", () => openSelectedItem());
|
|
keyboardHandler.on("Enter", () => openSelectedItem());
|
|
keyboardHandler.on("v", () => openOriginalLink());
|
|
keyboardHandler.on("V", () => openOriginalLink(true));
|
|
keyboardHandler.on("c", () => openCommentLink());
|
|
keyboardHandler.on("C", () => openCommentLink(true));
|
|
keyboardHandler.on("m", () => handleEntryStatus("next"));
|
|
keyboardHandler.on("M", () => handleEntryStatus("previous"));
|
|
keyboardHandler.on("A", () => markPageAsRead());
|
|
keyboardHandler.on("s", () => handleSaveEntry());
|
|
keyboardHandler.on("d", () => handleFetchOriginalContent());
|
|
keyboardHandler.on("f", () => handleBookmark());
|
|
keyboardHandler.on("F", () => goToFeed());
|
|
keyboardHandler.on("R", () => handleRefreshAllFeeds());
|
|
keyboardHandler.on("?", () => showKeyboardShortcuts());
|
|
keyboardHandler.on("+", () => goToAddSubscription());
|
|
keyboardHandler.on("#", () => unsubscribeFromFeed());
|
|
keyboardHandler.on("/", (e) => setFocusToSearchInput(e));
|
|
keyboardHandler.on("a", () => {
|
|
let enclosureElement = document.querySelector('.entry-enclosures');
|
|
if (enclosureElement) {
|
|
enclosureElement.toggleAttribute('open');
|
|
}
|
|
});
|
|
keyboardHandler.on("Escape", () => ModalHandler.close());
|
|
keyboardHandler.listen();
|
|
}
|
|
|
|
let touchHandler = new TouchHandler();
|
|
touchHandler.listen();
|
|
|
|
if (WebAuthnHandler.isWebAuthnSupported()) {
|
|
const webauthnHandler = new WebAuthnHandler();
|
|
|
|
onClick("#webauthn-delete", () => { webauthnHandler.removeAllCredentials() });
|
|
|
|
let registerButton = document.getElementById("webauthn-register");
|
|
if (registerButton != null) {
|
|
registerButton.disabled = false;
|
|
|
|
onClick("#webauthn-register", () => {
|
|
webauthnHandler.register().catch((err) => WebAuthnHandler.showErrorMessage(err));
|
|
});
|
|
}
|
|
|
|
let loginButton = document.getElementById("webauthn-login");
|
|
if (loginButton != null) {
|
|
const abortController = new AbortController();
|
|
loginButton.disabled = false;
|
|
|
|
onClick("#webauthn-login", () => {
|
|
let usernameField = document.getElementById("form-username");
|
|
if (usernameField != null) {
|
|
abortController.abort();
|
|
webauthnHandler.login(usernameField.value).catch(err => WebAuthnHandler.showErrorMessage(err));
|
|
}
|
|
});
|
|
|
|
webauthnHandler.conditionalLogin(abortController).catch(err => WebAuthnHandler.showErrorMessage(err));
|
|
}
|
|
}
|
|
|
|
onClick(":is(a, button)[data-save-entry]", (event) => handleSaveEntry(event.target));
|
|
onClick(":is(a, button)[data-toggle-bookmark]", (event) => handleBookmark(event.target));
|
|
onClick(":is(a, button)[data-fetch-content-entry]", () => handleFetchOriginalContent());
|
|
onClick(":is(a, button)[data-share-status]", () => handleShare());
|
|
onClick(":is(a, button)[data-action=markPageAsRead]", (event) => handleConfirmationMessage(event.target, () => markPageAsRead()));
|
|
onClick(":is(a, button)[data-toggle-status]", (event) => handleEntryStatus("next", event.target));
|
|
|
|
onClick(":is(a, button)[data-confirm]", (event) => handleConfirmationMessage(event.target, (url, redirectURL) => {
|
|
let request = new RequestBuilder(url);
|
|
|
|
request.withCallback((response) => {
|
|
if (redirectURL) {
|
|
window.location.href = redirectURL;
|
|
} else if (response && response.redirected && response.url) {
|
|
window.location.href = response.url;
|
|
} else {
|
|
window.location.reload();
|
|
}
|
|
});
|
|
|
|
request.execute();
|
|
}));
|
|
|
|
onClick("a[data-original-link='true']", (event) => {
|
|
handleEntryStatus("next", event.target, true);
|
|
}, true);
|
|
onAuxClick("a[data-original-link='true']", (event) => {
|
|
if (event.button == 1) {
|
|
handleEntryStatus("next", event.target, true);
|
|
}
|
|
}, true);
|
|
|
|
checkMenuToggleModeByLayout()
|
|
window.addEventListener("resize", checkMenuToggleModeByLayout, { passive: true })
|
|
|
|
fixVoiceOverDetailsSummaryBug()
|
|
|
|
const logoElement = document.querySelector(".logo")
|
|
logoElement.addEventListener("click", (event) => toggleMainMenu(event));
|
|
logoElement.addEventListener("keydown", (event) => toggleMainMenu(event));
|
|
|
|
onClick(".header nav li", (event) => onClickMainMenuListItem(event));
|
|
|
|
if ("serviceWorker" in navigator) {
|
|
let scriptElement = document.getElementById("service-worker-script");
|
|
if (scriptElement) {
|
|
navigator.serviceWorker.register(scriptElement.src);
|
|
}
|
|
}
|
|
|
|
window.addEventListener('beforeinstallprompt', (e) => {
|
|
// Prevent Chrome 67 and earlier from automatically showing the prompt.
|
|
e.preventDefault();
|
|
|
|
let deferredPrompt = e;
|
|
const promptHomeScreen = document.getElementById('prompt-home-screen');
|
|
if (promptHomeScreen) {
|
|
promptHomeScreen.style.display = "block";
|
|
|
|
const btnAddToHomeScreen = document.getElementById('btn-add-to-home-screen');
|
|
if (btnAddToHomeScreen) {
|
|
btnAddToHomeScreen.addEventListener('click', (e) => {
|
|
e.preventDefault();
|
|
deferredPrompt.prompt();
|
|
deferredPrompt.userChoice.then(() => {
|
|
deferredPrompt = null;
|
|
promptHomeScreen.style.display = "none";
|
|
});
|
|
});
|
|
}
|
|
}
|
|
});
|
|
|
|
// Save and resume media position
|
|
const elements = document.querySelectorAll("audio[data-last-position],video[data-last-position]");
|
|
elements.forEach((element) => {
|
|
if (element.dataset.lastPosition) {
|
|
element.currentTime = element.dataset.lastPosition;
|
|
}
|
|
element.ontimeupdate = () => handlePlayerProgressionSave(element);
|
|
});
|
|
});
|