`;
item.innerHTML = html;
@@ -334,6 +353,19 @@
return;
}
+ // 检测是否存在评论区
+ const hasCommentSection = document.getElementById('artalk') ||
+ document.getElementById('Comments') ||
+ document.querySelector('.atk-comment-wrap');
+
+ if (!hasCommentSection) {
+ // console.log('[Barrage] 当前页面无评论区，隐藏弹幕');
+ if (barrageInstance) {
+ barrageInstance.hide();
+ }
+ return;
+ }
+
// 1. 获取容器，如果没有则动态创建
let container = document.querySelector('.barrager');
if (!container) {
@@ -343,10 +375,9 @@
document.body.appendChild(container);
}
- // 2. 清理旧实例
+ // 确保显示（无论是否有评论区，都允许弹幕存在，可能显示的是上一页的数据或 Hitokoto）
if (barrageInstance) {
- barrageInstance.destroy();
- barrageInstance = null;
+ barrageInstance.show();
}
try {
@@ -371,13 +402,27 @@
if (!text.trim()) return null;
let avatar = '';
- const domComment = document.getElementById(`atk-comment-${c.id}`);
- if (domComment) {
- const img = domComment.querySelector('.atk-avatar img');
- if (img && img.src) avatar = img.src;
+
+ // 1. 优先尝试使用 email_encrypted 构造 Gravatar (适用于跨页面无 DOM 的情况)
+ if (c.email_encrypted) {
+ avatar = `https://cravatar.cn/avatar/${c.email_encrypted}?d=mp&s=240`;
+ } else if (c.email_hash) {
+ avatar = `https://cravatar.cn/avatar/${c.email_hash}?d=mp&s=240`;
}
+
+ // 2. 如果没有 hash，尝试从 API 对象直接获取
+ if (!avatar && c.avatar) {
+ avatar = c.avatar;
+ }
+
+ // 3. 尝试从 UA 获取
+ if (!avatar && c.ua && c.ua.avatar) {
+ avatar = c.ua.avatar;
+ }
+
+ // 4. 兜底默认头像
if (!avatar) {
- avatar = c.avatar || (c.ua && c.ua.avatar) || 'https://cravatar.cn/avatar/default?d=mp';
+ avatar = 'https://cravatar.cn/avatar/default?d=mp';
}
return {
@@ -403,17 +448,18 @@
if (barrageList.length === 0) {
console.log('[Barrage] 无弹幕数据');
+ // 即使无数据，也不要销毁实例，保持空转即可
return;
}
- // 再次检查实例 (竞态保护)
+ // 更新实例或创建新实例
if (barrageInstance) {
- barrageInstance.destroy();
+ barrageInstance.updateData(barrageList);
+ } else {
+ console.log(`[Barrage] 初始化: ${barrageList.length} 条`);
+ barrageInstance = new BarrageEngine({ container });
+ barrageInstance.start(barrageList);
}
-
- console.log(`[Barrage] 最终加载: ${barrageList.length} 条`);
- barrageInstance = new BarrageEngine({ container });
- barrageInstance.start(barrageList);
} catch (e) {
console.warn('[Barrage] 加载异常:', e);
@@ -427,5 +473,10 @@
document.addEventListener('DOMContentLoaded', () => {
setTimeout(loadBarrager, 500);
});
+
+ // PJAX 适配
+ document.addEventListener('pjax:complete', () => {
+ setTimeout(loadBarrager, 500);
+ });
})();
diff --git a/themes/Ying/assets/js/main.js b/themes/Ying/assets/js/main.js
index d04d5a8e..0e303409 100644
--- a/themes/Ying/assets/js/main.js
+++ b/themes/Ying/assets/js/main.js
@@ -27,4 +27,5 @@ document.addEventListener('DOMContentLoaded', function() {
if (window.initCodeFold) window.initCodeFold();
if (window.initCodeCopy) window.initCodeCopy();
if (window.initParagraphComments) window.initParagraphComments();
+ if (window.initInfiniteScroll && window.enableInfiniteScroll) window.initInfiniteScroll();
});
diff --git a/themes/Ying/assets/js/modules/artalk.js b/themes/Ying/assets/js/modules/artalk.js
index 736bafab..3a200a0d 100644
--- a/themes/Ying/assets/js/modules/artalk.js
+++ b/themes/Ying/assets/js/modules/artalk.js
@@ -76,9 +76,36 @@ window.initArtalk = function() {
var remoteConf = artalk.conf || (artalk.ctx && artalk.ctx.conf);
if (remoteConf) {
- // We only really want to cache the fields that come from the server,
- // but saving the whole object is easier. We just have to be careful when merging.
- localStorage.setItem(confKey, JSON.stringify(remoteConf));
+ // Filter out non-serializable properties (like DOM elements, circular refs)
+ var safeConf = {};
+ for (var key in remoteConf) {
+ var val = remoteConf[key];
+ // Skip if value is a DOM element
+ if (val instanceof Element || val instanceof Node) continue;
+ // Skip if value is window or document
+ if (val === window || val === document) continue;
+ // Skip internal private properties starting with $ or _
+ if (key.startsWith('$') || key.startsWith('_')) continue;
+ // Only allow simple types or simple objects
+ var type = typeof val;
+ if (type === 'string' || type === 'number' || type === 'boolean' || val === null) {
+ safeConf[key] = val;
+ } else if (type === 'object') {
+ // Simple array check
+ if (Array.isArray(val)) {
+ safeConf[key] = val;
+ } else {
+ // For objects, deep check might be too expensive/complex here.
+ // We'll try to shallow copy if it looks like a plain object
+ // and doesn't have circular markers like 'el'
+ if (val.constructor === Object && !val.el && !val.$el) {
+ safeConf[key] = val;
+ }
+ }
+ }
+ }
+
+ localStorage.setItem(confKey, JSON.stringify(safeConf));
// console.log('Artalk: Config cached to', confKey);
}
} catch(e) {
diff --git a/themes/Ying/assets/js/modules/floating-tools.js b/themes/Ying/assets/js/modules/floating-tools.js
index 030b176f..49bae919 100644
--- a/themes/Ying/assets/js/modules/floating-tools.js
+++ b/themes/Ying/assets/js/modules/floating-tools.js
@@ -58,11 +58,16 @@ window.initFloatingTools = function() {
// Global Scroll Handler (Singleton)
if (!window.backToTopScrollHandler) {
window.backToTopScrollHandler = function() {
+ // Performance Optimization: Check scroll less frequently?
+ // No, rAF is best. But we can add a check if the button is even in DOM/Visible?
+ // But checking DOM layout is expensive.
+ // Keep rAF but ensure 'update' is light.
if (!ticking) {
window.requestAnimationFrame(update);
ticking = true;
}
};
+ // Use passive listener to prevent scroll blocking
window.addEventListener('scroll', window.backToTopScrollHandler, { passive: true });
}
diff --git a/themes/Ying/assets/js/modules/infinite-scroll.js b/themes/Ying/assets/js/modules/infinite-scroll.js
new file mode 100644
index 00000000..96fb5b57
--- /dev/null
+++ b/themes/Ying/assets/js/modules/infinite-scroll.js
@@ -0,0 +1,132 @@
+
+window.initInfiniteScroll = function() {
+ // Configuration
+ const containerSelector = '.posts';
+ const itemSelector = '.post';
+ const paginationSelector = '.pagination';
+ const nextLinkSelector = '.pagination .page-next .next';
+ const loadingText = '加载中...';
+ const noMoreText = '没有更多了';
+
+ const container = document.querySelector(containerSelector);
+ if (!container) return; // Not on a page with posts
+
+ // Check if we already have an observer (to prevent duplicates on PJAX re-init)
+ if (window.infiniteScrollObserver) {
+ window.infiniteScrollObserver.disconnect();
+ window.infiniteScrollObserver = null;
+ }
+
+ // Remove existing sentinel if any
+ const existingSentinel = document.getElementById('infinite-scroll-sentinel');
+ if (existingSentinel) existingSentinel.remove();
+
+ // Find next link
+ let nextLink = document.querySelector(nextLinkSelector);
+ if (!nextLink) return; // No next page
+
+ // Hide default pagination
+ const pagination = document.querySelector(paginationSelector);
+ if (pagination) pagination.style.display = 'none';
+
+ // Create sentinel
+ const sentinel = document.createElement('div');
+ sentinel.id = 'infinite-scroll-sentinel';
+ sentinel.innerHTML = `
${loadingText}
`;
+
+ // Insert after container
+ container.parentNode.insertBefore(sentinel, container.nextSibling);
+
+ let isLoading = false;
+
+ const loadNextPage = async () => {
+ if (isLoading) return;
+
+ // Re-check next link from the DOM (it should be updated after previous fetch)
+ nextLink = document.querySelector(nextLinkSelector);
+ if (!nextLink) {
+ sentinel.innerHTML = `