|
|
@@ -1,186 +1,184 @@
|
|
|
-document.addEventListener("DOMContentLoaded", () => {
|
|
|
- disableSubmitButtonsOnFormSubmit();
|
|
|
-
|
|
|
- if (!document.querySelector("body[data-disable-keyboard-shortcuts=true]")) {
|
|
|
- const 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", goToFeedOrFeedsPage);
|
|
|
- keyboardHandler.on("g c", () => goToPage("categories"));
|
|
|
- keyboardHandler.on("g s", () => goToPage("settings"));
|
|
|
- keyboardHandler.on("g g", () => goToPreviousPage(TOP));
|
|
|
- keyboardHandler.on("G", () => goToNextPage(BOTTOM));
|
|
|
- keyboardHandler.on("ArrowLeft", goToPreviousPage);
|
|
|
- keyboardHandler.on("ArrowRight", goToNextPage);
|
|
|
- keyboardHandler.on("k", goToPreviousPage);
|
|
|
- keyboardHandler.on("p", goToPreviousPage);
|
|
|
- keyboardHandler.on("j", goToNextPage);
|
|
|
- keyboardHandler.on("n", goToNextPage);
|
|
|
- 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(false));
|
|
|
- keyboardHandler.on("V", () => openOriginalLink(true));
|
|
|
- keyboardHandler.on("c", () => openCommentLink(false));
|
|
|
- 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", goToFeedPage);
|
|
|
- keyboardHandler.on("R", handleRefreshAllFeeds);
|
|
|
- keyboardHandler.on("?", showKeyboardShortcuts);
|
|
|
- keyboardHandler.on("+", goToAddSubscriptionPage);
|
|
|
- keyboardHandler.on("#", unsubscribeFromFeed);
|
|
|
- keyboardHandler.on("/", () => goToPage("search"));
|
|
|
- keyboardHandler.on("a", () => {
|
|
|
- const enclosureElement = document.querySelector('.entry-enclosures');
|
|
|
- if (enclosureElement) {
|
|
|
- enclosureElement.toggleAttribute('open');
|
|
|
- }
|
|
|
- });
|
|
|
- keyboardHandler.on("Escape", () => ModalHandler.close());
|
|
|
- keyboardHandler.listen();
|
|
|
- }
|
|
|
-
|
|
|
- const touchHandler = new TouchHandler();
|
|
|
- touchHandler.listen();
|
|
|
-
|
|
|
- if (WebAuthnHandler.isWebAuthnSupported()) {
|
|
|
- const webauthnHandler = new WebAuthnHandler();
|
|
|
+disableSubmitButtonsOnFormSubmit();
|
|
|
+
|
|
|
+if (!document.querySelector("body[data-disable-keyboard-shortcuts=true]")) {
|
|
|
+ const 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", goToFeedOrFeedsPage);
|
|
|
+ keyboardHandler.on("g c", () => goToPage("categories"));
|
|
|
+ keyboardHandler.on("g s", () => goToPage("settings"));
|
|
|
+ keyboardHandler.on("g g", () => goToPreviousPage(TOP));
|
|
|
+ keyboardHandler.on("G", () => goToNextPage(BOTTOM));
|
|
|
+ keyboardHandler.on("ArrowLeft", goToPreviousPage);
|
|
|
+ keyboardHandler.on("ArrowRight", goToNextPage);
|
|
|
+ keyboardHandler.on("k", goToPreviousPage);
|
|
|
+ keyboardHandler.on("p", goToPreviousPage);
|
|
|
+ keyboardHandler.on("j", goToNextPage);
|
|
|
+ keyboardHandler.on("n", goToNextPage);
|
|
|
+ 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(false));
|
|
|
+ keyboardHandler.on("V", () => openOriginalLink(true));
|
|
|
+ keyboardHandler.on("c", () => openCommentLink(false));
|
|
|
+ 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", goToFeedPage);
|
|
|
+ keyboardHandler.on("R", handleRefreshAllFeeds);
|
|
|
+ keyboardHandler.on("?", showKeyboardShortcuts);
|
|
|
+ keyboardHandler.on("+", goToAddSubscriptionPage);
|
|
|
+ keyboardHandler.on("#", unsubscribeFromFeed);
|
|
|
+ keyboardHandler.on("/", () => goToPage("search"));
|
|
|
+ keyboardHandler.on("a", () => {
|
|
|
+ const enclosureElement = document.querySelector('.entry-enclosures');
|
|
|
+ if (enclosureElement) {
|
|
|
+ enclosureElement.toggleAttribute('open');
|
|
|
+ }
|
|
|
+ });
|
|
|
+ keyboardHandler.on("Escape", () => ModalHandler.close());
|
|
|
+ keyboardHandler.listen();
|
|
|
+}
|
|
|
|
|
|
- onClick("#webauthn-delete", () => { webauthnHandler.removeAllCredentials(); });
|
|
|
+const touchHandler = new TouchHandler();
|
|
|
+touchHandler.listen();
|
|
|
|
|
|
- const registerButton = document.getElementById("webauthn-register");
|
|
|
- if (registerButton !== null) {
|
|
|
- registerButton.disabled = false;
|
|
|
+if (WebAuthnHandler.isWebAuthnSupported()) {
|
|
|
+ const webauthnHandler = new WebAuthnHandler();
|
|
|
|
|
|
- onClick("#webauthn-register", () => {
|
|
|
- webauthnHandler.register().catch((err) => WebAuthnHandler.showErrorMessage(err));
|
|
|
- });
|
|
|
- }
|
|
|
+ onClick("#webauthn-delete", () => { webauthnHandler.removeAllCredentials(); });
|
|
|
|
|
|
- const loginButton = document.getElementById("webauthn-login");
|
|
|
- if (loginButton !== null) {
|
|
|
- const abortController = new AbortController();
|
|
|
- loginButton.disabled = false;
|
|
|
-
|
|
|
- onClick("#webauthn-login", () => {
|
|
|
- const usernameField = document.getElementById("form-username");
|
|
|
- if (usernameField !== null) {
|
|
|
- abortController.abort();
|
|
|
- webauthnHandler.login(usernameField.value).catch(err => WebAuthnHandler.showErrorMessage(err));
|
|
|
- }
|
|
|
- });
|
|
|
+ const registerButton = document.getElementById("webauthn-register");
|
|
|
+ if (registerButton !== null) {
|
|
|
+ registerButton.disabled = false;
|
|
|
|
|
|
- webauthnHandler.conditionalLogin(abortController).catch(err => WebAuthnHandler.showErrorMessage(err));
|
|
|
- }
|
|
|
+ onClick("#webauthn-register", () => {
|
|
|
+ webauthnHandler.register().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) => {
|
|
|
- const 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();
|
|
|
+ const loginButton = document.getElementById("webauthn-login");
|
|
|
+ if (loginButton !== null) {
|
|
|
+ const abortController = new AbortController();
|
|
|
+ loginButton.disabled = false;
|
|
|
+
|
|
|
+ onClick("#webauthn-login", () => {
|
|
|
+ const usernameField = document.getElementById("form-username");
|
|
|
+ if (usernameField !== null) {
|
|
|
+ abortController.abort();
|
|
|
+ webauthnHandler.login(usernameField.value).catch(err => WebAuthnHandler.showErrorMessage(err));
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- request.execute();
|
|
|
- }));
|
|
|
+ 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) => {
|
|
|
+ const 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) => {
|
|
|
+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);
|
|
|
- onAuxClick("a[data-original-link='true']", (event) => {
|
|
|
- if (event.button === 1) {
|
|
|
- handleEntryStatus("next", event.target, true);
|
|
|
- }
|
|
|
- }, true);
|
|
|
+ }
|
|
|
+}, true);
|
|
|
|
|
|
- checkMenuToggleModeByLayout();
|
|
|
- window.addEventListener("resize", checkMenuToggleModeByLayout, { passive: true });
|
|
|
+checkMenuToggleModeByLayout();
|
|
|
+window.addEventListener("resize", checkMenuToggleModeByLayout, { passive: true });
|
|
|
|
|
|
- fixVoiceOverDetailsSummaryBug();
|
|
|
+fixVoiceOverDetailsSummaryBug();
|
|
|
|
|
|
- const logoElement = document.querySelector(".logo");
|
|
|
- if (logoElement) {
|
|
|
- logoElement.addEventListener("click", toggleMainMenu);
|
|
|
- logoElement.addEventListener("keydown", toggleMainMenu);
|
|
|
- }
|
|
|
+const logoElement = document.querySelector(".logo");
|
|
|
+if (logoElement) {
|
|
|
+ logoElement.addEventListener("click", toggleMainMenu);
|
|
|
+ logoElement.addEventListener("keydown", toggleMainMenu);
|
|
|
+}
|
|
|
|
|
|
- onClick(".header nav li", (event) => onClickMainMenuListItem(event));
|
|
|
+onClick(".header nav li", (event) => onClickMainMenuListItem(event));
|
|
|
|
|
|
- if ("serviceWorker" in navigator) {
|
|
|
- const scriptElement = document.getElementById("service-worker-script");
|
|
|
- if (scriptElement) {
|
|
|
- navigator.serviceWorker.register(ttpolicy.createScriptURL(scriptElement.src));
|
|
|
- }
|
|
|
+if ("serviceWorker" in navigator) {
|
|
|
+ const scriptElement = document.getElementById("service-worker-script");
|
|
|
+ if (scriptElement) {
|
|
|
+ navigator.serviceWorker.register(ttpolicy.createScriptURL(scriptElement.src));
|
|
|
}
|
|
|
-
|
|
|
- window.addEventListener('beforeinstallprompt', (e) => {
|
|
|
- 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";
|
|
|
- });
|
|
|
+}
|
|
|
+
|
|
|
+window.addEventListener('beforeinstallprompt', (e) => {
|
|
|
+ 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 lastPositionElements = document.querySelectorAll("audio[data-last-position],video[data-last-position]");
|
|
|
- lastPositionElements.forEach((element) => {
|
|
|
- if (element.dataset.lastPosition) {
|
|
|
- element.currentTime = element.dataset.lastPosition;
|
|
|
- }
|
|
|
- element.ontimeupdate = () => handlePlayerProgressionSaveAndMarkAsReadOnCompletion(element);
|
|
|
- });
|
|
|
+// Save and resume media position
|
|
|
+const lastPositionElements = document.querySelectorAll("audio[data-last-position],video[data-last-position]");
|
|
|
+lastPositionElements.forEach((element) => {
|
|
|
+ if (element.dataset.lastPosition) {
|
|
|
+ element.currentTime = element.dataset.lastPosition;
|
|
|
+ }
|
|
|
+ element.ontimeupdate = () => handlePlayerProgressionSaveAndMarkAsReadOnCompletion(element);
|
|
|
+});
|
|
|
|
|
|
- // Set media playback rate
|
|
|
- const playbackRateElements = document.querySelectorAll("audio[data-playback-rate],video[data-playback-rate]");
|
|
|
- playbackRateElements.forEach((element) => {
|
|
|
- if (element.dataset.playbackRate) {
|
|
|
- element.playbackRate = element.dataset.playbackRate;
|
|
|
- if (element.dataset.enclosureId){
|
|
|
- // In order to display properly the speed we need to do it on bootstrap.
|
|
|
- // Could not do it backend side because I didn't know how to do it because of the template inclusion and
|
|
|
- // the way the initial playback speed is handled. See enclosure_media_controls.html if you want to try to fix this
|
|
|
- document.querySelectorAll(`span.speed-indicator[data-enclosure-id="${element.dataset.enclosureId}"]`).forEach((speedI)=>{
|
|
|
- speedI.innerText = `${parseFloat(element.dataset.playbackRate).toFixed(2)}x`;
|
|
|
- });
|
|
|
- }
|
|
|
+// Set media playback rate
|
|
|
+const playbackRateElements = document.querySelectorAll("audio[data-playback-rate],video[data-playback-rate]");
|
|
|
+playbackRateElements.forEach((element) => {
|
|
|
+ if (element.dataset.playbackRate) {
|
|
|
+ element.playbackRate = element.dataset.playbackRate;
|
|
|
+ if (element.dataset.enclosureId){
|
|
|
+ // In order to display properly the speed we need to do it on bootstrap.
|
|
|
+ // Could not do it backend side because I didn't know how to do it because of the template inclusion and
|
|
|
+ // the way the initial playback speed is handled. See enclosure_media_controls.html if you want to try to fix this
|
|
|
+ document.querySelectorAll(`span.speed-indicator[data-enclosure-id="${element.dataset.enclosureId}"]`).forEach((speedI)=>{
|
|
|
+ speedI.innerText = `${parseFloat(element.dataset.playbackRate).toFixed(2)}x`;
|
|
|
+ });
|
|
|
}
|
|
|
- });
|
|
|
+ }
|
|
|
+});
|
|
|
|
|
|
- // Set enclosure media controls handlers
|
|
|
- const mediaControlsElements = document.querySelectorAll("button[data-enclosure-action]");
|
|
|
- mediaControlsElements.forEach((element) => {
|
|
|
- element.addEventListener("click", () => handleMediaControl(element));
|
|
|
- });
|
|
|
+// Set enclosure media controls handlers
|
|
|
+const mediaControlsElements = document.querySelectorAll("button[data-enclosure-action]");
|
|
|
+mediaControlsElements.forEach((element) => {
|
|
|
+ element.addEventListener("click", () => handleMediaControl(element));
|
|
|
});
|
Frédéric Guillot