mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-08-10 20:48:42 +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:
+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')
|
||||
|
||||
+21
-16
@@ -1,16 +1,21 @@
|
||||
script.
|
||||
(async () => {
|
||||
const showKatex = () => {
|
||||
document.querySelectorAll('#article-container .katex').forEach(el => el.classList.add('katex-show'))
|
||||
}
|
||||
|
||||
if (!window.katex_js_css) {
|
||||
window.katex_js_css = true
|
||||
await btf.getCSS('!{url_for(theme.asset.katex)}')
|
||||
if (!{theme.math.katex.copy_tex}) {
|
||||
await btf.getScript('!{url_for(theme.asset.katex_copytex)}')
|
||||
}
|
||||
}
|
||||
|
||||
showKatex()
|
||||
})()
|
||||
script.
|
||||
(async () => {
|
||||
const showKatex = () => {
|
||||
document.querySelectorAll('#article-container .katex').forEach(el => el.classList.add('katex-show'))
|
||||
}
|
||||
|
||||
if (!window.katex_js_css) {
|
||||
window.katex_js_css = true
|
||||
try {
|
||||
await btf.getCSS('!{url_for(theme.asset.katex)}')
|
||||
if (!{theme.math.katex.copy_tex}) {
|
||||
await btf.getScript('!{url_for(theme.asset.katex_copytex)}')
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('[katex] failed to load assets, showing formulas anyway:', e)
|
||||
}
|
||||
}
|
||||
|
||||
showKatex()
|
||||
btf.addGlobalFn('encrypt', showKatex, 'katex')
|
||||
})()
|
||||
|
||||
+3
-1
@@ -77,5 +77,7 @@ script.
|
||||
}
|
||||
|
||||
btf.addGlobalFn('encrypt', loadMathjax, 'mathjax')
|
||||
window.pjax ? loadMathjax() : window.addEventListener('load', loadMathjax)
|
||||
if (window.pjax) loadMathjax()
|
||||
else if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', loadMathjax)
|
||||
else loadMathjax()
|
||||
})()
|
||||
+3
-1
@@ -282,12 +282,14 @@ script.
|
||||
const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
|
||||
ele.forEach((item, index) => {
|
||||
const mermaidSrc = item.firstElementChild
|
||||
// Clean up event listeners before removing old SVG
|
||||
// Clean up event listeners and stale content before re-rendering
|
||||
if (item.__mermaidAbortController) {
|
||||
item.__mermaidAbortController.abort()
|
||||
}
|
||||
const oldSvg = item.querySelector('svg')
|
||||
if (oldSvg) oldSvg.remove()
|
||||
const oldError = item.querySelector('.mermaid-error')
|
||||
if (oldError) oldError.remove()
|
||||
let config = {}
|
||||
try {
|
||||
config = mermaidSrc.dataset.config ? JSON.parse(mermaidSrc.dataset.config) : {}
|
||||
|
||||
Reference in New Issue
Block a user