mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-10-04 22:32:00 +08:00
feat: add wordcount helpers, waline lightbox, and extensive bug fixes
- wordcount/min2read/totalcount built-in helpers (replaces hexo-wordcount) - cloudTags random sort support - waline lightbox via MutationObserver - subtitle: seq guard prevents stale API response race - newest-comments: escapeHtml XSS fix, unified fetchAndRender with cache fallback - katex: try/catch asset load, encrypt re-render - chartjs: destroy charts on pjax, fix theme property check - mathjax: DOMContentLoaded instead of load - mermaid: clean stale error elements - medium-zoom: single instance, detach on pjax - getScrollPercent: WeakMap cache with resize invalidation - overflowPaddingR: avoid stale DOM refs - readmode: dedupe button, pjax cleanup - hexo-blog-decrypt: null-guard translateFn and encryptFn - tw_cn: expand skipped translate tags - localStorage: try/catch setItem - cdn.js: fix [lib|dist]* character class regex bug - findArchivesTitle: support custom archive_dir - shuoshuoFN: guard moment.tz when timezone empty - umami: no-store cache, error handling, path param - artalk: vote config option - bump version 5.7.1.260810
This commit is contained in:
1 parent
51d36ef83a
commit
79e16a5cdd
25 files changed
+726
-624
No files matched your search
@@ -43,13 +43,13 @@
|
||||
if theme.wordcount.post_wordcount
|
||||
i.far.fa-file-word.fa-fw.post-meta-icon
|
||||
span.post-meta-label= _p('post.wordcount') + ':'
|
||||
span.word-count= wordcount(page.content)
|
||||
span.word-count= wordcount(page)
|
||||
if theme.wordcount.min2read
|
||||
span.post-meta-separator |
|
||||
if theme.wordcount.min2read
|
||||
i.far.fa-clock.fa-fw.post-meta-icon
|
||||
span.post-meta-label= _p('post.min2read') + ':'
|
||||
span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
|
||||
span= min2read(page) + ' ' + _p('post.min2read_unit')
|
||||
|
||||
//- for pv and count
|
||||
mixin pvBlock(parent_id, parent_class, parent_title)
|
||||
|
||||
+22
-1
@@ -20,8 +20,29 @@ script.
|
||||
path: isShuoshuo ? path : (option && option.path) || path
|
||||
})
|
||||
|
||||
let lightboxObserver = null
|
||||
if (GLOBAL_CONFIG.lightbox !== 'null') {
|
||||
const wrap = el.querySelector('#waline-wrap')
|
||||
if (wrap) {
|
||||
lightboxObserver = new MutationObserver(mutations => {
|
||||
const imgs = []
|
||||
mutations.forEach(mutation => {
|
||||
mutation.addedNodes.forEach(node => {
|
||||
if (node.nodeType !== 1) return
|
||||
const nodeImgs = node.matches && node.matches('img') ? [node] : node.querySelectorAll('img')
|
||||
nodeImgs.forEach(img => imgs.push(img))
|
||||
})
|
||||
})
|
||||
const lightboxImgs = imgs.filter(img => img.closest('.wl-content') && !img.classList.contains('wl-emoji'))
|
||||
if (lightboxImgs.length) btf.loadLightbox(lightboxImgs)
|
||||
})
|
||||
lightboxObserver.observe(wrap, { childList: true, subtree: true })
|
||||
}
|
||||
}
|
||||
|
||||
if (isShuoshuo) {
|
||||
window.shuoshuoComment.destroyWaline = () => {
|
||||
lightboxObserver && lightboxObserver.disconnect()
|
||||
destroyWaline(waline)
|
||||
if (el.children.length) {
|
||||
el.innerHTML = ''
|
||||
@@ -46,7 +67,7 @@ script.
|
||||
|
||||
if (isShuoshuo) {
|
||||
'!{use[0]}' === 'Waline'
|
||||
? window.shuoshuoComment = { loadComment: loadWaline }
|
||||
? window.shuoshuoComment = { loadComment: loadWaline }
|
||||
: window.loadOtherComment = loadWaline
|
||||
return
|
||||
}
|
||||
|
||||
+14
-3
@@ -22,7 +22,7 @@ script.
|
||||
const value = obj[key]
|
||||
// If the property is an object and has theme-specific options, apply them
|
||||
if (typeof value === 'object' && value !== null) {
|
||||
if (value[theme]) {
|
||||
if (theme in value) {
|
||||
obj[key] = value[theme] // Apply the value for the current theme
|
||||
} else {
|
||||
// Recursively process child objects
|
||||
@@ -32,6 +32,11 @@ script.
|
||||
})
|
||||
}
|
||||
|
||||
const destroyChart = canvas => {
|
||||
const chart = canvas && window.Chart && Chart.getChart(canvas)
|
||||
if (chart) chart.destroy()
|
||||
}
|
||||
|
||||
const runChartJS = ele => {
|
||||
window.loadChartJS = true
|
||||
|
||||
@@ -41,9 +46,10 @@ script.
|
||||
const width = item.getAttribute('data-width')
|
||||
const existingCanvas = document.getElementById(chartID)
|
||||
|
||||
// If a canvas already exists, remove it to avoid rendering duplicates
|
||||
// If a canvas already exists, destroy its chart and remove it to avoid rendering duplicates
|
||||
if (existingCanvas) {
|
||||
existingCanvas.parentNode.remove()
|
||||
destroyChart(existingCanvas)
|
||||
existingCanvas.parentNode.remove()
|
||||
}
|
||||
|
||||
const chartDefinition = chartSrc.textContent
|
||||
@@ -83,6 +89,11 @@ script.
|
||||
window.loadChartJS ? runChartJS(chartJSEle) : btf.getScript('!{url_for(theme.asset.chartjs)}').then(() => runChartJS(chartJSEle))
|
||||
}
|
||||
|
||||
// Destroy all charts before navigating away to avoid leaks
|
||||
btf.addGlobalFn('pjaxSendOnce', () => {
|
||||
document.querySelectorAll('.chartjs-wrap canvas').forEach(destroyChart)
|
||||
}, 'chartjs')
|
||||
|
||||
// Listen for theme change events
|
||||
btf.addGlobalFn('themeChange', loadChartJS, 'chartjs')
|
||||
btf.addGlobalFn('encrypt', loadChartJS, 'chartjs')
|
||||
|
||||
Loaded 3 of 25 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user