Use same-tab reader navigation

static/app.js

@@ -623,12 +623,6 @@ function openExternalWindow(url) {
   return popup;
 }
 
-function openPendingWindow() {
-  const popup = window.open("about:blank", "_blank");
-  if (popup) popup.opener = null;
-  return popup;
-}
-
 function buildDownloadUrl(filename, link) {
   return `/api/download?file=${encodeURIComponent(filename || "file")}&link=${encodeURIComponent(link || "")}`;
 }
@@ -2495,30 +2489,26 @@ async function randomBook() {
   }
 }
 
-function openReaderRecord(rec, popup) {
+function openReaderRecord(rec) {
   if (!rec) return false;
   const url = getReaderLink(rec);
   if (!url) return false;
   if (STATE.isMobile) { STATE.leftSidebarOpen = false; STATE.rightSidebarOpen = false; updateSidebarVisibility(); }
-  if (popup) popup.location.replace(url);
-  else openExternalWindow(url);
+  location.assign(url);
   return true;
 }
 
 async function randomTxt() {
-  const popup = openPendingWindow();
   try {
     showToast("正在随机打开文章...");
     const url = STATE.repo ? `/api/random-reader?repo=${encodeURIComponent(STATE.repo)}` : "/api/random-reader";
     const resp = await fetch(url);
     if (!resp.ok) throw new Error("HTTP " + resp.status);
     const rec = await resp.json();
-    if (!openReaderRecord(rec, popup)) {
-      if (popup) popup.close();
+    if (!openReaderRecord(rec)) {
       showToast("暂无可读文章");
     }
   } catch (e) {
-    if (popup) popup.close();
     console.error(e);
     showToast("获取失败");
   }
@@ -2872,7 +2862,7 @@ function setupResultDelegation() {
       }
       if (action === "read") {
         if (STATE.isMobile) { STATE.leftSidebarOpen = false; STATE.rightSidebarOpen = false; updateSidebarVisibility(); }
-        openExternalWindow(actionBtn.dataset.readerUrl);
+        location.assign(actionBtn.dataset.readerUrl);
         return;
       }
     }
@@ -2931,7 +2921,7 @@ function setupResultDelegation() {
     const readUrl = browserItem.dataset.readUrl;
     if (readUrl) {
       if (STATE.isMobile) { STATE.leftSidebarOpen = false; STATE.rightSidebarOpen = false; updateSidebarVisibility(); }
-      openExternalWindow(readUrl);
+      location.assign(readUrl);
       return;
     }
     const fileLink = browserItem.dataset.link;

static/reader.js

@@ -55,8 +55,15 @@ document.querySelector(".page-controls").hidden = !["pdf", "epub"].includes(capa
 document.querySelector("#title").textContent = title;
 document.title = title + " - VoiceOfML Reader";
 document.querySelector("#back").addEventListener("click", () => {
-  if (history.length > 1) history.back();
-  else { try { const target = new URL(returnUrl); location.assign(target.origin === location.origin ? target.href : "/"); } catch (_) { location.assign("/"); } }
+  try {
+    const target = new URL(returnUrl);
+    if (target.origin === location.origin) {
+      if (history.length > 1) history.back();
+      else location.assign(target.href);
+      return;
+    }
+  } catch (_) {}
+  location.assign("/");
 });
 function setZoom(percent, persist = true) {
   const normalized = VoiceOfMLReader.clampNumber(percent, 50, 250, 100);