-
+
@@ -2013,7 +2126,7 @@ async function refreshAllFeeds() {
}
async function removeFeed(feedId) {
- if (!confirm('Remove this podcast?')) return;
+ if (!await customConfirm('Remove this podcast?', { danger: true })) return;
try {
await fetch(`/podcasts/feeds/${feedId}/remove/`, {
method: 'POST',
@@ -2052,7 +2165,7 @@ async function importOPML(input) {
async function downloadEpisode(url, title, btn) {
if (!('caches' in window)) {
- alert('Cache API not supported in this browser.');
+ await customAlert('Cache API not supported in this browser.');
return;
}
@@ -2072,7 +2185,7 @@ async function downloadEpisode(url, title, btn) {
if (btn) { btn.textContent = 'β'; btn.disabled = false; }
} catch (e) {
if (btn) { btn.textContent = origText; btn.disabled = false; }
- alert('Download failed: ' + e.message);
+ await customAlert('Download failed: ' + e.message);
}
}
@@ -2390,11 +2503,11 @@ async function uploadBackground(file) {
if (!file) return;
const allowedTypes = ['image/jpeg', 'image/png', 'image/webp'];
if (!allowedTypes.includes(file.type)) {
- alert('Only JPEG, PNG, or WebP images are allowed.');
+ await customAlert('Only JPEG, PNG, or WebP images are allowed.');
return;
}
if (file.size > DIORA_CONFIG.bgMaxBytes) {
- alert(`Image must be ${DIORA_CONFIG.bgMaxBytes / 1024 / 1024} MB or smaller.`);
+ await customAlert(`Image must be ${DIORA_CONFIG.bgMaxBytes / 1024 / 1024} MB or smaller.`);
return;
}
@@ -2658,6 +2771,82 @@ let _resizeObserver = null;
let _currentPositionAnchor = '';
const bookMetaCache = {}; // id β {title, author, type}
+// ---------------------------------------------------------------------------
+// Reader "scrolled too far" safety net β offers a toast to jump back after a
+// sudden, large scroll (accidental fling, fat-fingered keybind, etc.). Only
+// watches organic scrolling; explicit destination jumps (TOC, bookmarks, the
+// progress input, search) call _suppressScrollJumpDetect() first so they
+// don't trigger it.
+// ---------------------------------------------------------------------------
+let _scrollRestTop = null; // scrollTop last "settled" at, before the current burst
+let _scrollRestDebounce = null;
+let _scrollJumpSuppressed = false; // true while an explicit/programmatic jump is in flight
+let _scrollJumpToastEl = null;
+
+// Marks the current (and any immediately-following, possibly animated) scroll
+// as deliberate, so _checkScrollJump ignores it. Suppression lifts itself
+// once scrolling actually settles (see _armScrollJumpSettle) β not after a
+// fixed delay β so it stays active for however long a `smooth` scroll
+// animation to a far-away target actually takes, and calling this again
+// (e.g. from repeated resize-triggered corrections while a book settles)
+// simply pushes that settle point further out instead of racing it.
+function _suppressScrollJumpDetect() {
+ _scrollJumpSuppressed = true;
+ _armScrollJumpSettle();
+}
+
+function _armScrollJumpSettle() {
+ clearTimeout(_scrollRestDebounce);
+ _scrollRestDebounce = setTimeout(() => {
+ const contentEl = $('reader-content');
+ if (contentEl) _scrollRestTop = contentEl.scrollTop;
+ _scrollJumpSuppressed = false;
+ }, 500);
+}
+
+function _dismissScrollJumpToast() {
+ if (_scrollJumpToastEl) {
+ _scrollJumpToastEl.remove();
+ _scrollJumpToastEl = null;
+ }
+}
+
+function _showScrollJumpToast(backTop) {
+ _dismissScrollJumpToast();
+ const toast = document.createElement('div');
+ toast.className = 'reader-toast reader-toast-action';
+ toast.innerHTML = `
Weit gescrollt`;
+ document.body.appendChild(toast);
+ _scrollJumpToastEl = toast;
+ toast.querySelector('.reader-toast-btn').addEventListener('click', () => {
+ const contentEl = $('reader-content');
+ if (contentEl) {
+ _suppressScrollJumpDetect();
+ contentEl.scrollTo({top: backTop, behavior: 'smooth'});
+ }
+ _dismissScrollJumpToast();
+ });
+ setTimeout(_dismissScrollJumpToast, 6000);
+}
+
+function _checkScrollJump(contentEl) {
+ const top = contentEl.scrollTop;
+ if (_scrollRestTop === null) _scrollRestTop = top; // first sample this session
+
+ if (!_scrollJumpSuppressed && !_scrollJumpToastEl) {
+ const screen = contentEl.clientHeight || 1;
+ if (Math.abs(top - _scrollRestTop) > screen * 3.5) {
+ _showScrollJumpToast(_scrollRestTop);
+ }
+ }
+
+ // Only adopt the new position as the "settled" baseline β and lift any
+ // suppression β once scrolling has paused for a bit. That's what lets a
+ // fast, still-in-progress fling (or a long smooth-scroll animation) be
+ // compared against/protected until it actually finishes, not mid-flight.
+ _armScrollJumpSettle();
+}
+
const EPUB_BLOCK_SELECTOR = 'p, h1, h2, h3, h4, h5, h6, li, blockquote, dt, dd, figcaption, div:not(:has(*))';
function getPositionAnchor(contentEl) {
@@ -3127,7 +3316,7 @@ function repairBook(bookId) {
openBook(bookId);
} catch (e) {
if (btn) btn.textContent = '!';
- alert('Reparatur fehlgeschlagen: ' + e.message);
+ await customAlert('Reparatur fehlgeschlagen: ' + e.message);
}
};
input.click();
@@ -3139,7 +3328,7 @@ function renderBookList(books) {
let html = '';
for (const b of books) {
const pct = Math.round((b.scroll_fraction || 0) * 100);
- const keyWarning = b.keyOk === false ? '
β οΈ wrong key' : '';
+ const keyWarning = b.keyOk === false ? '
β wrong key' : '';
const broken = _brokenBooks.has(b.id);
html += `
@@ -3572,6 +3761,7 @@ async function openBook(bookId) {
}
progressInput.addEventListener('change', function () {
+ _suppressScrollJumpDetect();
if (isPdf) {
const page = Math.min(numPages, Math.max(1, parseInt(this.value, 10) || 1));
this.value = page;
@@ -3591,6 +3781,7 @@ async function openBook(bookId) {
}
// Restore scroll position β must happen BEFORE auto-save timer is started
+ _suppressScrollJumpDetect();
try {
let fraction = 0, anchor = '';
try {
@@ -3632,6 +3823,11 @@ async function openBook(bookId) {
}
} catch (e) {}
+ // Prime the "settled" baseline to wherever we just restored to, rather
+ // than waiting to lazily pick up whatever scroll event happens to fire
+ // first β that could otherwise be a later, unrelated layout correction.
+ _scrollRestTop = contentEl.scrollTop;
+
// Update progress input on scroll
contentEl.addEventListener('scroll', () => {
if (!progressInput) return;
@@ -3661,16 +3857,42 @@ async function openBook(bookId) {
_scrollDebounce = setTimeout(saveReaderProgress, 2000);
}, {passive: true});
+ // Keep _currentPositionAnchor fresh independent of the slower save debounce
+ // above: the resize observer below (or an immersive-bars toggle right after
+ // scrolling) would otherwise restore to a stale, pre-scroll anchor.
+ if (!isPdf) {
+ let _anchorTrackDebounce = null;
+ contentEl.addEventListener('scroll', () => {
+ clearTimeout(_anchorTrackDebounce);
+ _anchorTrackDebounce = setTimeout(() => {
+ _currentPositionAnchor = getPositionAnchor(contentEl);
+ }, 150);
+ }, {passive: true});
+ }
+
// Restore anchor on viewport resize (e.g. screen rotation, font zoom)
if (!isPdf) {
_resizeObserver = new ResizeObserver(() => {
if (_currentPositionAnchor) {
+ _suppressScrollJumpDetect();
requestAnimationFrame(() => restoreFromAnchor(contentEl, _currentPositionAnchor));
}
});
_resizeObserver.observe(contentEl);
}
+ // Offer to jump back after a sudden, large scroll (accidental fling,
+ // fat-fingered 'g'/'G' keybind, etc.) β see _checkScrollJump above.
+ _scrollRestTop = null;
+ let _scrollJumpRaf = null;
+ contentEl.addEventListener('scroll', () => {
+ if (_scrollJumpRaf) return;
+ _scrollJumpRaf = requestAnimationFrame(() => {
+ _scrollJumpRaf = null;
+ _checkScrollJump(contentEl);
+ });
+ }, {passive: true});
+
enterReaderImmersiveMode();
} catch (e) {
@@ -3722,7 +3944,7 @@ function showImportKey() {
}
async function deleteBook(bookId) {
- if (!confirm('Delete this book? This cannot be undone.')) return;
+ if (!await customConfirm('Delete this book? This cannot be undone.', { danger: true })) return;
try {
const res = await fetch(`/books/${bookId}/delete/`, {
method: 'POST',
@@ -3869,6 +4091,7 @@ function openTocSidebar() {
function jumpToTocEntry(href) {
closeSidebar();
+ _suppressScrollJumpDetect();
setTimeout(() => {
const contentEl = $('reader-content');
if (!contentEl) return;
@@ -3944,6 +4167,7 @@ function applyReaderSettings(isPdf) {
contentEl.style.fontFamily = fontMap[readerSettings.fontFamily] || fontMap.serif;
contentEl.classList.toggle('reader-no-bold', !!readerSettings.noBold);
if (_currentPositionAnchor && currentBookId) {
+ _suppressScrollJumpDetect();
requestAnimationFrame(() => restoreFromAnchor($('reader-content'), _currentPositionAnchor));
}
}
@@ -3979,9 +4203,9 @@ function toggleSettingsPanel() {
if (!isPdf) {
panel.innerHTML = `
-
-
-
+
+
+
@@ -4011,6 +4235,14 @@ function toggleSettingsPanel() {
applyReaderSettings(false);
saveReaderSettings();
});
+ panel.querySelector('#rs-font-minus').addEventListener('click', () => {
+ fontRange.value = Math.max(+fontRange.min, parseInt(fontRange.value, 10) - 1);
+ fontRange.dispatchEvent(new Event('input'));
+ });
+ panel.querySelector('#rs-font-plus').addEventListener('click', () => {
+ fontRange.value = Math.min(+fontRange.max, parseInt(fontRange.value, 10) + 1);
+ fontRange.dispatchEvent(new Event('input'));
+ });
const lineRange = panel.querySelector('#rs-line');
const lineVal = panel.querySelector('#rs-line-val');
@@ -4020,6 +4252,14 @@ function toggleSettingsPanel() {
applyReaderSettings(false);
saveReaderSettings();
});
+ panel.querySelector('#rs-line-minus').addEventListener('click', () => {
+ lineRange.value = Math.max(+lineRange.min, parseInt(lineRange.value, 10) - 1);
+ lineRange.dispatchEvent(new Event('input'));
+ });
+ panel.querySelector('#rs-line-plus').addEventListener('click', () => {
+ lineRange.value = Math.min(+lineRange.max, parseInt(lineRange.value, 10) + 1);
+ lineRange.dispatchEvent(new Event('input'));
+ });
const widthRange = panel.querySelector('#rs-width');
const widthVal = panel.querySelector('#rs-width-val');
@@ -4029,6 +4269,14 @@ function toggleSettingsPanel() {
applyReaderSettings(false);
saveReaderSettings();
});
+ panel.querySelector('#rs-width-minus').addEventListener('click', () => {
+ widthRange.value = Math.max(+widthRange.min, parseInt(widthRange.value, 10) - 5);
+ widthRange.dispatchEvent(new Event('input'));
+ });
+ panel.querySelector('#rs-width-plus').addEventListener('click', () => {
+ widthRange.value = Math.min(+widthRange.max, parseInt(widthRange.value, 10) + 5);
+ widthRange.dispatchEvent(new Event('input'));
+ });
panel.querySelector('#rs-width-full').addEventListener('click', () => {
readerSettings.maxWidth = 999;
@@ -4472,6 +4720,7 @@ function jumpToBookmark(id) {
const bm = currentBookmarks.find(b => b.id === id);
if (!bm) return;
closeSidebar();
+ _suppressScrollJumpDetect();
setTimeout(() => {
const contentEl = $('reader-content');
if (!contentEl) return;
@@ -4648,6 +4897,7 @@ function clearReaderSearch() {
function scrollToSearchMatch(idx) {
if (!searchMatches.length) return;
+ _suppressScrollJumpDetect();
searchMatches.forEach((m, i) => m.classList.toggle('active', i === idx));
searchMatches[idx].scrollIntoView({behavior: 'smooth', block: 'center'});
const countEl = document.getElementById('rs-search-count');
@@ -5161,11 +5411,19 @@ function openRadioSidebar() {
// Init book drop zone
initBookDropZone();
- // Restore last active tab β when offline, always go to books (most useful)
- const savedTab = localStorage.getItem('diora_active_tab') || 'radio';
- const savedRadioTab = localStorage.getItem('diora_active_radio_tab') || 'saved';
- showTab(!navigator.onLine && IS_AUTHENTICATED ? 'books' : savedTab);
- showRadioTab(savedRadioTab);
+ // Restore active tab: a URL hash (shared/bookmarked link, or browser
+ // back/forward) wins over the last-used tab remembered in localStorage β
+ // except when offline, where books (usable offline) always takes over.
+ const offlineOverride = !navigator.onLine && IS_AUTHENTICATED;
+ const hashTab = (location.hash || '').replace(/^#/, '').split('/')[0];
+ if (!offlineOverride && TOP_TABS.includes(hashTab)) {
+ _routeFromHash();
+ } else {
+ const savedTab = localStorage.getItem('diora_active_tab') || 'radio';
+ const savedRadioTab = localStorage.getItem('diora_active_radio_tab') || 'saved';
+ showTab(offlineOverride ? 'books' : savedTab);
+ showRadioTab(savedRadioTab);
+ }
// React to connectivity changes
window.addEventListener('offline', () => {
diff --git a/static/js/sw.js b/static/js/sw.js
index 8f11f96..7d2d734 100644
--- a/static/js/sw.js
+++ b/static/js/sw.js
@@ -2,7 +2,7 @@
* diora service worker β caches the app shell for offline use.
*/
-const CACHE = 'diora-v15';
+const CACHE = 'diora-v21';
const PODCAST_CACHE = 'diora-podcast-v1';
const SHELL = [
'/static/css/app.css',
diff --git a/templates/radio/player.html b/templates/radio/player.html
index 76fba67..abfc16f 100644
--- a/templates/radio/player.html
+++ b/templates/radio/player.html
@@ -18,14 +18,14 @@
-
+
-
+
0:00
0:00
-
+
@@ -43,7 +43,7 @@
-
+
@@ -131,7 +131,7 @@