${display}
${hexo.render.renderSync({ text: content, engine: 'markdown' })}
${display}
${renderedContent}
.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
- content = content.replace(/.*?<\/code>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+ content = content.replace(/.*?<\/code>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
content = content.replace(/<[^>]+>/g, "") // remove html tag
if (content.length > 150) {
@@ -23,8 +23,9 @@ script.
result += ''
if (!{theme.aside.card_newest_comments.avatar} && array[i].avatar) {
- const imgAttr = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
- result += `![${array[i].nick}]()
`
+ const imgAttr = '!{theme.lazyload.enable && !theme.lazyload.native ? "data-lazy-src" : "src"}'
+ const lazyloadNative = '!{theme.lazyload.enable && theme.lazyload.native ? "loading=\"lazy\"" : ""}'
+ result += `![${array[i].nick}]()
`
}
result += `
diff --git a/layout/includes/third-party/search/algolia.pug b/layout/includes/third-party/search/algolia.pug
index b1f3c3d47..4ef600179 100644
--- a/layout/includes/third-party/search/algolia.pug
+++ b/layout/includes/third-party/search/algolia.pug
@@ -14,7 +14,7 @@
#algolia-info
.algolia-stats
.algolia-poweredBy
-
+
#search-mask
script(src=url_for(theme.asset.algolia_search))
diff --git a/layout/includes/third-party/umami_analytics.pug b/layout/includes/third-party/umami_analytics.pug
index 518afd53f..3534c20c3 100644
--- a/layout/includes/third-party/umami_analytics.pug
+++ b/layout/includes/third-party/umami_analytics.pug
@@ -35,7 +35,7 @@ script.
const insertData = async () => {
try {
- if (GLOBAL_CONFIG_SITE.isPost && config.page_pv) {
+ if (GLOBAL_CONFIG_SITE.pageType === 'post' && config.page_pv) {
const pagePV = document.getElementById('umamiPV')
if (pagePV) {
const data = await getData(true)
diff --git a/layout/includes/widget/card_author.pug b/layout/includes/widget/card_author.pug
index 095f66fa5..9f7e68756 100644
--- a/layout/includes/widget/card_author.pug
+++ b/layout/includes/widget/card_author.pug
@@ -13,14 +13,14 @@ if theme.aside.card_author.enable
.headline= _p('aside.tags')
.length-num= site.tags.length
a(href=url_for(config.category_dir) + '/')
- .headline= _p('aside.categories')
+ .headline= _p('aside.categories')
.length-num= site.categories.length
if theme.aside.card_author.button.enable
a#card-info-btn(href=theme.aside.card_author.button.link)
i(class=theme.aside.card_author.button.icon)
span=theme.aside.card_author.button.text
-
+
if(theme.social)
.card-info-social-icons
!=partial('includes/header/social', {}, {cache: true})
diff --git a/layout/includes/widget/card_post_toc.pug b/layout/includes/widget/card_post_toc.pug
index b811210ed..cd30d50f4 100644
--- a/layout/includes/widget/card_post_toc.pug
+++ b/layout/includes/widget/card_post_toc.pug
@@ -10,6 +10,5 @@
if (page.encrypt == true)
.toc-content.toc-div-class(class=tocExpandClass style="display:none")!=toc(page.origin, {list_number: tocNumber})
- else
+ else
.toc-content(class=tocExpandClass)!=toc(page.content, {list_number: tocNumber})
-
\ No newline at end of file
diff --git a/layout/includes/widget/index.pug b/layout/includes/widget/index.pug
index 388ea1cc6..b29887895 100644
--- a/layout/includes/widget/index.pug
+++ b/layout/includes/widget/index.pug
@@ -1,6 +1,6 @@
#aside-content.aside-content
//- post
- if is_post()
+ if globalPageType === 'post'
- const tocStyle = page.toc_style_simple
- const tocStyleVal = tocStyle === true || tocStyle === false ? tocStyle : theme.toc.style_simple
if showToc && tocStyleVal
diff --git a/layout/post.pug b/layout/post.pug
index 08bdea3a7..947b3793b 100644
--- a/layout/post.pug
+++ b/layout/post.pug
@@ -17,7 +17,7 @@ block content
each item, index in page.tags.data
a(href=url_for(item.path)).post-meta__tags #[=item.name]
include includes/third-party/share/index.pug
-
+
if theme.reward.enable && theme.reward.QR_code
!=partial('includes/post/reward', {}, {cache: true})
@@ -33,4 +33,3 @@ block content
if page.comments !== false && theme.comments.use
- var commentsJsLoad = true
!=partial('includes/third-party/comments/index', {}, {cache: true})
-
\ No newline at end of file
diff --git a/package.json b/package.json
index 12450b2d6..5eff91acb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "hexo-theme-butterfly",
- "version": "5.3.0-b1",
+ "version": "5.3.0-b2",
"description": "A Simple and Card UI Design theme for Hexo",
"main": "package.json",
"scripts": {
diff --git a/scripts/events/merge_config.js b/scripts/events/merge_config.js
index a1ba9e995..c14c57cd5 100644
--- a/scripts/events/merge_config.js
+++ b/scripts/events/merge_config.js
@@ -547,6 +547,7 @@ hexo.extend.filter.register('before_generate', () => {
instantpage: false,
lazyload: {
enable: false,
+ native: false,
field: 'site',
placeholder: null,
blur: false
diff --git a/scripts/filters/post_lazyload.js b/scripts/filters/post_lazyload.js
index cecc6ce27..7ad6339d2 100644
--- a/scripts/filters/post_lazyload.js
+++ b/scripts/filters/post_lazyload.js
@@ -9,6 +9,10 @@
const urlFor = require('hexo-util').url_for.bind(hexo)
const lazyload = htmlContent => {
+ if (hexo.theme.config.lazyload.native) {
+ return htmlContent.replace(/()/ig, '$1 loading=\'lazy\'$2')
+ }
+
const bg = hexo.theme.config.lazyload.placeholder ? urlFor(hexo.theme.config.lazyload.placeholder) : 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
return htmlContent.replace(/( {
return finalResult
})
+
+hexo.extend.helper.register('getPageType', (page, isHome) => {
+ const { layout, tag, category, type, archive } = page
+ if (layout) return layout
+ if (tag) return 'tag'
+ if (category) return 'category'
+ if (archive) return 'archive'
+ if (type) {
+ if (type === 'tags' || type === 'categories') return type
+ else return 'page'
+ }
+ if (isHome) return 'home'
+ return 'post'
+})
diff --git a/scripts/tag/hide.js b/scripts/tag/hide.js
index a788172fb..3a58bec25 100644
--- a/scripts/tag/hide.js
+++ b/scripts/tag/hide.js
@@ -16,50 +16,37 @@
'use strict'
-const parseArgs = args => {
- return args.join(' ').split(',')
-}
+const parseArgs = args => args.join(' ').split(',')
const generateStyle = (bg, color) => {
let style = 'style="'
- if (bg) {
- style += `background-color: ${bg};`
- }
- if (color) {
- style += `color: ${color}`
- }
+ if (bg) style += `background-color: ${bg};`
+ if (color) style += `color: ${color}`
style += '"'
return style
}
const hideInline = args => {
const [content, display = 'Click', bg = false, color = false] = parseArgs(args)
- const group = generateStyle(bg, color)
-
- return ``
+ const style = generateStyle(bg, color)
+ return ``
}
const hideBlock = (args, content) => {
const [display = 'Click', bg = false, color = false] = parseArgs(args)
- const group = generateStyle(bg, color)
-
- return ``
+ const style = generateStyle(bg, color)
+ const renderedContent = hexo.render.renderSync({ text: content, engine: 'markdown' })
+ return ``
}
const hideToggle = (args, content) => {
const [display, bg = false, color = false] = parseArgs(args)
- const group = generateStyle(bg, color)
- let border = ''
-
- if (bg) {
- border = `style="border: 1px solid ${bg}"`
- }
-
- return `${display}
${hexo.render.renderSync({ text: content, engine: 'markdown' })}`
+ const style = generateStyle(bg, color)
+ const border = bg ? `style="border: 1px solid ${bg}"` : ''
+ const renderedContent = hexo.render.renderSync({ text: content, engine: 'markdown' })
+ return `${display}
${renderedContent}`
}
hexo.extend.tag.register('hideInline', hideInline)
hexo.extend.tag.register('hideBlock', hideBlock, { ends: true })
-hexo.extend.tag.register('hideToggle', hideToggle, { ends: true })
+hexo.extend.tag.register('hideToggle', hideToggle, { ends: true })
\ No newline at end of file
diff --git a/source/js/main.js b/source/js/main.js
index 42cfd9766..db49960a7 100644
--- a/source/js/main.js
+++ b/source/js/main.js
@@ -864,7 +864,7 @@ document.addEventListener('DOMContentLoaded', () => {
menuMask && menuMask.addEventListener('click', () => { sidebarFn.close() })
clickFnOfSubMenu()
- GLOBAL_CONFIG.islazyload && lazyloadImg()
+ GLOBAL_CONFIG.islazyloadPlugin && lazyloadImg()
GLOBAL_CONFIG.copyright !== undefined && addCopyright()
if (GLOBAL_CONFIG.autoDarkmode) {
@@ -890,7 +890,7 @@ document.addEventListener('DOMContentLoaded', () => {
initAdjust()
justifiedIndexPostUI()
- if (GLOBAL_CONFIG_SITE.isPost) {
+ if (GLOBAL_CONFIG_SITE.pageType === 'post') {
addPostOutdateNotice()
GLOBAL_CONFIG.relativeDate.post && relativeDate(document.querySelectorAll('#post-meta time'))
} else {
@@ -900,11 +900,11 @@ document.addEventListener('DOMContentLoaded', () => {
toggleCardCategory()
}
- GLOBAL_CONFIG_SITE.isHome && scrollDownInIndex()
+ GLOBAL_CONFIG_SITE.pageType === 'home' && scrollDownInIndex()
scrollFn()
forPostFn()
- !GLOBAL_CONFIG_SITE.isShuoshuo && btf.switchComments(document)
+ GLOBAL_CONFIG_SITE.pageType !== 'shuoshuo' && btf.switchComments(document)
openMobileMenu()
}