diff --git a/layout/includes/additional-js.pug b/layout/includes/additional-js.pug index 9bae95a..6c8874e 100644 --- a/layout/includes/additional-js.pug +++ b/layout/includes/additional-js.pug @@ -52,7 +52,7 @@ div != partial("includes/third-party/umami_analytics", {}, { cache: true }) if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv - script(async data-pjax src= theme.asset.busuanzi || '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js') + script(async data-pjax src=url_for(theme.asset.busuanzi) || '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js') != partial('includes/third-party/search/index', {}, { cache: true }) diff --git a/layout/includes/page/shuoshuo.pug b/layout/includes/page/shuoshuo.pug index ee36041..3e5f15b 100644 --- a/layout/includes/page/shuoshuo.pug +++ b/layout/includes/page/shuoshuo.pug @@ -49,6 +49,7 @@ if !page.shuoshuo_url script(type='application/json' id='shuoshuo-data')!= safeJSON(localDate) + - const { enable, native, placeholder, field } = theme.lazyload script. (() => { const limitConfig = !{ JSON.stringify(page.limit || {}) } @@ -84,6 +85,36 @@ return `${year}-${month}-${day} ${hour}:${minute}:${second}` } + const addLazyload = str => { + const config = { + enable: !{Boolean(enable)}, + native: !{Boolean(native)}, + field: '!{field}', + placeholder: '!{url_for(placeholder)}', + } + + if (!config.enable || config.field !== 'site') return str + const parser = new DOMParser() + const doc = parser.parseFromString(str, 'text/html') + const images = doc.querySelectorAll('img') + + images.forEach(img => { + if (config.native) { + img.setAttribute('loading', 'lazy') + } else { + const src = img.getAttribute('src') + img.setAttribute('data-lazy-src', src) + + if (config.placeholder) { + img.setAttribute('src', config.placeholder) + } else { + img.removeAttribute('src') + } + } + }) + return doc.body.innerHTML + } + let currentPage = 1 const itemsPerPage = 8 let totalPages = 0 @@ -117,7 +148,7 @@ -
${item.content}
+
${addLazyload(item.content)}
${tags ? `
${tags}
` : ''} ${commentButton} diff --git a/layout/includes/third-party/comments/artalk.pug b/layout/includes/third-party/comments/artalk.pug index 7d0e857..58dd252 100644 --- a/layout/includes/third-party/comments/artalk.pug +++ b/layout/includes/third-party/comments/artalk.pug @@ -51,8 +51,8 @@ script. const loadArtalk = async (el, pageKey) => { if (typeof Artalk === 'object') initArtalk(el, pageKey) else { - await btf.getCSS('!{theme.asset.artalk_css}') - await btf.getScript('!{theme.asset.artalk_js}') + await btf.getCSS('!{url_for(theme.asset.artalk_css)}') + await btf.getScript('!{url_for(theme.asset.artalk_js)}') initArtalk(el, pageKey) } } diff --git a/layout/includes/third-party/math/mermaid.pug b/layout/includes/third-party/math/mermaid.pug index d28049f..0be9dec 100644 --- a/layout/includes/third-party/math/mermaid.pug +++ b/layout/includes/third-party/math/mermaid.pug @@ -6,7 +6,11 @@ script. ele.forEach((item, index) => { const mermaidSrc = item.firstElementChild - const mermaidThemeConfig = `%%{init:{ 'theme':'${theme}'}}%%\n` + const config = mermaidSrc.dataset.config ? JSON.parse(mermaidSrc.dataset.config) : {} + if (!config.theme) { + config.theme = theme + } + const mermaidThemeConfig = `%%{init: ${JSON.stringify(config)}}%%\n` const mermaidID = `mermaid-${index}` const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent diff --git a/package.json b/package.json index a61b971..b81a51d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "5.5.1", + "version": "5.5.2", "description": "A Simple and Card UI Design theme for Hexo", "main": "package.json", "scripts": { @@ -25,7 +25,7 @@ "dependencies": { "hexo-renderer-pug": "^3.0.0", "hexo-renderer-stylus": "^3.0.1", - "hexo-util": "^3.3.0", + "hexo-util": "^4.0.0", "moment-timezone": "^0.6.0" }, "homepage": "https://butterfly.js.org/", diff --git a/plugins.yml b/plugins.yml index 42f6693..1246ce5 100644 --- a/plugins.yml +++ b/plugins.yml @@ -9,7 +9,7 @@ activate_power_mode: algolia_search: name: algoliasearch file: dist/lite/builds/browser.umd.js - version: 5.39.0 + version: 5.43.0 aplayer_css: name: aplayer file: dist/APlayer.min.css @@ -45,7 +45,7 @@ canvas_ribbon: chartjs: name: chart.js file: dist/chart.umd.js - version: 4.5.0 + version: 4.5.1 clickShowText: name: butterfly-extsrc file: dist/click-show-text.min.js @@ -57,21 +57,21 @@ click_heart: disqusjs: name: disqusjs file: dist/browser/disqusjs.es2015.umd.min.js - version: 3.1.1 + version: 3.2.1 disqusjs_css: name: disqusjs file: dist/browser/styles/disqusjs.css - version: 3.1.1 + version: 3.2.1 docsearch_css: name: '@docsearch/css' other_name: docsearch-css file: dist/style.css - version: 4.1.0 + version: 4.3.1 docsearch_js: name: '@docsearch/js' other_name: docsearch-js file: dist/umd/index.js - version: 4.1.0 + version: 4.3.1 egjs_infinitegrid: name: '@egjs/infinitegrid' other_name: egjs-infinitegrid @@ -80,12 +80,12 @@ egjs_infinitegrid: fancybox: name: '@fancyapps/ui' file: dist/fancybox/fancybox.umd.js - version: 6.0.33 + version: 6.1.4 other_name: fancyapps-ui fancybox_css: name: '@fancyapps/ui' file: dist/fancybox/fancybox.css - version: 6.0.33 + version: 6.1.4 other_name: fancyapps-ui fireworks: name: butterfly-extsrc @@ -112,12 +112,12 @@ katex: name: katex file: dist/katex.min.css other_name: KaTeX - version: 0.16.22 + version: 0.16.25 katex_copytex: name: katex file: dist/contrib/copy-tex.min.js other_name: KaTeX - version: 0.16.22 + version: 0.16.25 lazyload: name: vanilla-lazyload file: dist/lazyload.iife.min.js @@ -133,7 +133,7 @@ medium_zoom: mermaid: name: mermaid file: dist/mermaid.min.js - version: 11.12.0 + version: 11.12.1 meting_js: name: butterfly-extsrc file: metingjs/dist/Meting.min.js @@ -199,9 +199,9 @@ waline_css: name: '@waline/client' file: dist/waline.css other_name: waline - version: 3.6.0 + version: 3.7.1 waline_js: name: '@waline/client' file: dist/waline.js other_name: waline - version: 3.6.0 + version: 3.7.1 diff --git a/scripts/helpers/aside_archives.js b/scripts/helpers/aside_archives.js index 6301224..1d99d09 100644 --- a/scripts/helpers/aside_archives.js +++ b/scripts/helpers/aside_archives.js @@ -1,7 +1,7 @@ 'use strict' hexo.extend.helper.register('aside_archives', function (options = {}) { - const { config, page, site, url_for, _p } = this + const { config, page, site, url_for: urlFor, _p } = this const { archive_dir: archiveDir, timezone, language } = config // Destructure and set default options with object destructuring @@ -74,7 +74,7 @@ hexo.extend.helper.register('aside_archives', function (options = {}) { if (type === 'monthly') { url += item.month < 10 ? `0${item.month}/` : `${item.month}/` } - return url_for(url) + return urlFor(url) } // Limit results efficiently @@ -87,7 +87,7 @@ hexo.extend.helper.register('aside_archives', function (options = {}) { ${_p('aside.card_archives')} ${ data.length > limitedData.length - ? ` ` diff --git a/scripts/helpers/inject_head_js.js b/scripts/helpers/inject_head_js.js index 16e9b9a..515e996 100644 --- a/scripts/helpers/inject_head_js.js +++ b/scripts/helpers/inject_head_js.js @@ -4,9 +4,9 @@ hexo.extend.helper.register('inject_head_js', function () { const { darkmode, aside, pjax } = this.theme const start = darkmode.start || 6 const end = darkmode.end || 18 - const { theme_color } = hexo.theme.config - const themeColorLight = theme_color && theme_color.enable ? theme_color.meta_theme_color_light : '#ffffff' - const themeColorDark = theme_color && theme_color.enable ? theme_color.meta_theme_color_dark : '#0d0d0d' + const { theme_color: themeColor } = hexo.theme.config + const themeColorLight = themeColor && themeColor.enable ? themeColor.meta_theme_color_light : '#ffffff' + const themeColorDark = themeColor && themeColor.enable ? themeColor.meta_theme_color_dark : '#0d0d0d' const createCustomJs = () => ` const saveToLocal = { diff --git a/scripts/tag/mermaid.js b/scripts/tag/mermaid.js index 4fe59c0..af3b825 100644 --- a/scripts/tag/mermaid.js +++ b/scripts/tag/mermaid.js @@ -9,7 +9,8 @@ const { escapeHTML } = require('hexo-util') const mermaid = (args, content) => { - return `