${array[i].nick} /
+ .*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+ content = content.replace(/<[^>]+>/g,"") // remove html tag
+
+ if (content.length > 150) {
+ content = content.substring(0,150) + '...'
+ }
+ return content
+ }
+
+ const generateHtml = array => {
+ let result = ''
+
+ if (array.length) {
+ for (let i = 0; i < array.length; i++) {
+ result += ''
+
+ if (!{theme.newest_comments.avatar}) {
+ const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
+ result += `![${array[i].nick}]()
`
+ }
+
+ result += `
+ ${array[i].content}
+ `
+ }
+ } else {
+ result += '!{_p("aside.card_newest_comments.zero")}'
+ }
+
+ let $dom = document.querySelector('#card-newest-comments .aside-list')
+ $dom.innerHTML= result
+ window.lazyLoadInstance && window.lazyLoadInstance.update()
+ window.pjax && window.pjax.refresh($dom)
+ }
+
+ const getComment = () => {
+ fetch('!{server}/api/stat?type=latest_comments&limit=!{theme.newest_comments.limit}',{method: "POST"})
+ .then(response => response.json())
+ .then(d => {
+ const artalk = d.data.map(function (e) {
+ return {
+ 'avatar': '!{avatarCdn}' + e.email_encrypted + '?d=!{avatarDefault}',
+ 'content': changeContent(e.content_marked),
+ 'nick': e.nick,
+ 'url': e.page_url,
+ 'date': e.date,
+ }
+ })
+ saveToLocal.set('artalk-newest-comments', JSON.stringify(artalk), !{theme.newest_comments.storage}/(60*24))
+ generateHtml(artalk)
+ }).catch(e => {
+ const $dom = document.querySelector('#card-newest-comments .aside-list')
+ $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+ })
+ }
+
+ const newestCommentInit = () => {
+ if (document.querySelector('#card-newest-comments .aside-list')) {
+ const data = saveToLocal.get('artalk-newest-comments')
+ if (data) {
+ generateHtml(JSON.parse(data))
+ } else {
+ getComment()
+ }
+ }
+ }
+
+ newestCommentInit()
+ document.addEventListener('pjax:complete', newestCommentInit)
+ })
diff --git a/layout/includes/third-party/newest-comments/index.pug b/layout/includes/third-party/newest-comments/index.pug
index 826ccff..8ceaccf 100644
--- a/layout/includes/third-party/newest-comments/index.pug
+++ b/layout/includes/third-party/newest-comments/index.pug
@@ -25,4 +25,6 @@ if use
- userRepo = theme.utterances.repo
include ./github-issues.pug
when 'Remark42'
- include ./remark42.pug
\ No newline at end of file
+ include ./remark42.pug
+ when 'Artalk'
+ include ./artalk.pug
\ No newline at end of file
diff --git a/layout/includes/third-party/subtitle.pug b/layout/includes/third-party/subtitle.pug
index 63915ec..9236757 100644
--- a/layout/includes/third-party/subtitle.pug
+++ b/layout/includes/third-party/subtitle.pug
@@ -1,4 +1,4 @@
-- const { effect,loop,source,sub } = theme.subtitle
+- const { effect,loop,source,sub,startDelay,typeSpeed,backSpeed } = theme.subtitle
- let subContent = sub || new Array()
case source
@@ -14,10 +14,10 @@ case source
sub.unshift(data.hitokoto, from)
window.typed = new Typed('#subtitle', {
strings: sub,
- startDelay: 300,
- typeSpeed: 150,
+ startDelay: !{startDelay},
+ typeSpeed: !{typeSpeed},
loop: !{loop},
- backSpeed: 50,
+ backSpeed: !{backSpeed},
})
} else {
document.getElementById('subtitle').innerHTML = data.hitokoto
@@ -46,10 +46,10 @@ case source
sub.unshift(con, from)
window.typed = new Typed('#subtitle', {
strings: sub,
- startDelay: 300,
- typeSpeed: 150,
+ startDelay: !{startDelay},
+ typeSpeed: !{typeSpeed},
loop: !{loop},
- backSpeed: 50,
+ backSpeed: !{backSpeed},
})
} else {
document.getElementById('subtitle').innerHTML = con
@@ -78,10 +78,10 @@ case source
sub.unshift(content)
window.typed = new Typed('#subtitle', {
strings: sub,
- startDelay: 300,
- typeSpeed: 150,
+ startDelay: !{startDelay},
+ typeSpeed: !{typeSpeed},
loop: !{loop},
- backSpeed: 50,
+ backSpeed: !{backSpeed},
})
} else {
document.getElementById('subtitle').innerHTML = result.data.content
@@ -107,10 +107,10 @@ case source
if (!{effect}) {
window.typed = new Typed("#subtitle", {
strings: !{JSON.stringify(subContent)},
- startDelay: 300,
- typeSpeed: 150,
+ startDelay: !{startDelay},
+ typeSpeed: !{typeSpeed},
loop: !{loop},
- backSpeed: 50
+ backSpeed: !{backSpeed}
})
} else {
document.getElementById("subtitle").innerHTML = '!{subContent[0]}'
diff --git a/package.json b/package.json
index d5a1144..bbe96e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "hexo-theme-butterfly",
- "version": "4.3.1",
+ "version": "4.4.0",
"description": "A Simple and Card UI Design theme for Hexo",
"main": "package.json",
"scripts": {
diff --git a/plugins.yml b/plugins.yml
index c0d3eae..82892dd 100644
--- a/plugins.yml
+++ b/plugins.yml
@@ -1,11 +1,11 @@
algolia_search_v4:
name: algoliasearch
file: dist/algoliasearch-lite.umd.js
- version: 4.13.1
+ version: 4.14.2
instantsearch_v4:
name: instantsearch.js
file: dist/instantsearch.production.min.js
- version: 4.42.0
+ version: 4.44.0
pjax:
name: pjax
file: pjax.min.js
@@ -25,7 +25,7 @@ blueimp_md5:
valine:
name: valine
file: dist/Valine.min.js
- version: 1.4.18
+ version: 1.5.1
disqusjs:
name: disqusjs
file: dist/browser/disqusjs.es2015.umd.min.js
@@ -37,17 +37,17 @@ disqusjs_css:
twikoo:
name: twikoo
file: dist/twikoo.all.min.js
- version: 1.5.11
+ version: 1.6.5
waline_js:
name: '@waline/client'
file: dist/waline.js
other_name: waline
- version: 2.6.1
+ version: 2.6.3
waline_css:
name: '@waline/client'
file: dist/waline.css
other_name: waline
- version: 2.6.1
+ version: 2.6.3
sharejs:
name: butterfly-extsrc
file: sharejs/dist/js/social-share.min.js
@@ -73,7 +73,7 @@ katex_copytex:
mermaid:
name: mermaid
file: dist/mermaid.min.js
- version: 9.1.2
+ version: 9.1.5
canvas_ribbon:
name: butterfly-extsrc
file: dist/canvas-ribbon.min.js
@@ -109,7 +109,7 @@ lazyload:
instantpage:
name: instant.page
file: instantpage.js
- version: 5.1.0
+ version: 5.1.1
typed:
name: typed.js
file: lib/typed.min.js
@@ -121,12 +121,12 @@ pangu:
fancybox_css_v4:
name: '@fancyapps/ui'
file: dist/fancybox.css
- version: 4.0.27
+ version: 4.0.31
other_name: fancyapps-ui
fancybox_v4:
name: '@fancyapps/ui'
file: dist/fancybox.umd.js
- version: 4.0.27
+ version: 4.0.31
other_name: fancyapps-ui
medium_zoom:
name: medium-zoom
@@ -144,7 +144,7 @@ fontawesomeV6:
name: '@fortawesome/fontawesome-free'
file: css/all.min.css
other_name: font-awesome
- version: 6.1.1
+ version: 6.1.2
flickr_justified_gallery_js:
name: flickr-justified-gallery
file: dist/fjGallery.min.js
@@ -179,4 +179,12 @@ prismjs_autoloader:
name: prismjs
file: plugins/autoloader/prism-autoloader.min.js
other_name: prism
- version: 1.28.0
\ No newline at end of file
+ version: 1.28.0
+artalk_js:
+ name: artalk
+ file: dist/Artalk.js
+ version: 2.3.4
+artalk_css:
+ name: artalk
+ file: dist/Artalk.css
+ version: 2.3.4
\ No newline at end of file
diff --git a/source/css/_layout/chat.styl b/source/css/_layout/chat.styl
index 6d515f4..ea12227 100644
--- a/source/css/_layout/chat.styl
+++ b/source/css/_layout/chat.styl
@@ -6,3 +6,12 @@ if hexo-config('chat_btn') == true && hexo-config('chatra.enable')
height: 1px !important
opacity: 0 !important
pointer-events: none
+
+if hexo-config('chat_btn') == true && hexo-config('messenger.enable')
+ .fb_dialog,
+ .fb-customerchat
+ visibility: hidden !important
+ width: 1px !important
+ height: 1px !important
+ opacity: 0 !important
+ pointer-events: none
\ No newline at end of file
diff --git a/source/css/_layout/head.styl b/source/css/_layout/head.styl
index 87aa211..c7d4ca3 100644
--- a/source/css/_layout/head.styl
+++ b/source/css/_layout/head.styl
@@ -301,10 +301,10 @@
margin-top: 8px
padding: 0
width: max-content
+ border-radius: 5px
background-color: var(--sidebar-bg)
box-shadow: 0 5px 20px -4px rgba($dark-black, .5)
animation: sub_menus .3s .1s ease both
- border-radius: 5px
&:before
position: absolute
@@ -321,9 +321,13 @@
background: var(--text-bg-hover)
&:first-child
- border-radius: 5px 5px 0 0
+ border-top-left-radius: 5px
+ border-top-right-radius: 5px
+
&:last-child
- border-radius: 0 0 5px 5px
+ border-bottom-right-radius: 5px
+ border-bottom-left-radius: 5px
+
a
display: inline-block
padding: 8px 16px
@@ -369,4 +373,4 @@
&:hover
&:after
- width: 100%
+ width: 100%
\ No newline at end of file