Merge branch 'dev'

fix: 修復子目錄下，第三方插件本地資源無法加載的 bug closed #908
fix: 評論系統開啟時 busuanzi 的 page_pv 不顯示的 bug closed #902
fix: 修復 pjax 下，使用 mermaid 跳轉會重新加載的 bug

README.md

@@ -1,5 +1,7 @@
 <div align="right">
-<a title="Chinese" href="/README_CN.md">中文</a>
+  Language:
+  🇺🇸
+  <a title="Chinese" href="/README_CN.md">🇨🇳</a>
 </div>
 
 # hexo-theme-butterfly
@@ -12,9 +14,9 @@
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-📢 Demo: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
+Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [CrazyWong](https://crazywong.com/)
 
-📖 Docs: [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/) || [Chinese](https://butterfly.js.org/posts/21cfbf15/)
+Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
 Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
 
@@ -60,23 +62,23 @@ npm i hexo-theme-butterfly
 
 - [x] Card UI Design
 - [X] Support sub-menu
-- [x] Two-column layout
+- [x] Two Column designs
 - [x] Responsive Web Design
 - [x] Dark Mode
 - [x] Pjax
 - [x] Read Mode
 - [x] Conversion between Traditional and Simplified Chinese
 - [X] TOC catalog is available for both computers and mobile phones
-- [X] Built-in Syntax Highlighting Themes (darker/pale night/light/ocean/mac/mac light), also support customization
+- [X] Color themes (darker/pale night/light/ocean/mac/mac light), support custom colors
 - [X] Code Blocks (Display code language/close or expand Code Blocks/Copy Button/word wrap)
 - [X] Disable copy/Add a Copyright Notice to the Copied Text
-- [X] Search (Algolia Search/Local Search)
+- [X] Search (Algolia SearchZ/Local Search)
 - [x] Mathjax and Katex
 - [x] Built-in 404 page
 - [x] WordCount
 - [x] Related articles
 - [x] Displays outdated notice for a post
-- [x] Share (Sharejs/Addtoany)
+- [x] Share (AddThis/Sharejs/Addtoany)
 - [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk)
 - [x] Multiple Comment System Support
 - [x] Online Chats (Chatra/Tidio/Daovoice/Crisp/messenger)

README_CN.md

@@ -1,5 +1,7 @@
 <div align="right">
-  <a title="English" href="/README.md">English</a>
+  語言:
+  中文
+  <a title="English" href="/README.md">英文</a>
 </div>
 
 # hexo-theme-butterfly
@@ -12,9 +14,9 @@
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-📢 預覽: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
+預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [CrazyWong](https://crazywong.com/)
 
-📖 文檔: [中文](https://butterfly.js.org/posts/21cfbf15/) || [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/)
+文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
 
@@ -70,13 +72,13 @@ theme: butterfly
 - [X] 內置多種代碼配色（darker/pale night/light/ocean/mac/mac light），可自定義代碼配色
 - [X] 代碼塊顯示代碼語言/關閉或展開代碼塊/代碼複製/代碼自動換行
 - [X] 可關閉文字複製/可開啟內容複製增加版權信息）
-- [X] 兩種搜索（ Algolia 搜索和本地搜索）
+- [X] 兩種搜索（Algolia搜索和本地搜索）
 - [x] Mathjax 和 Katex
 - [x] 內置404頁面
 - [x] 顯示字數統計
 - [x] 顯示相關文章
 - [x] 過期文章提醒
-- [x] 多種分享系統（Sharejs/Addtoany）
+- [x] 多種分享系統（AddThis/Sharejs/Addtoany）
 - [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk）
 - [x] 支持雙評論部署
 - [x] 多種在線聊天（Chatra/Tidio/Daovoice/Crisp/messenger）

_config.yml

@@ -125,10 +125,11 @@ index_post_content:
 
 # anchor
 anchor:
-  # when you scroll, the URL will update according to header id.
+  button:
-  auto_update: false
+    enable: false
-  # Click the headline to scroll and update the anchor
+    always_show: false
-  click_to_scroll: false
+    icon: # the unicode value of Font Awesome icon, such as '\3423'
+  auto_update: false # when you scroll in post, the URL will update according to header id.
 
 # figcaption (圖片描述文字)
 photofigcaption: false
@@ -163,7 +164,6 @@ post_copyright:
 # Sponsor/reward
 reward:
   enable: false
-  text:
   QR_code:
     # - img: /img/wechat.jpg
     #   link:
@@ -264,10 +264,6 @@ aside:
     post_count: true
     last_push_date: true
     sort_order: # Don't modify the setting unless you know how it works
-  card_post_series:
-    enable: true
-    orderBy: 'date' # Order by title or date
-    order: -1 # Sort of order. 1, asc for ascending; -1, desc for descending
 
 # busuanzi count for PV / UV in site
 # 訪問人數
@@ -385,6 +381,12 @@ docsearch:
 # Share System (分享)
 # --------------------------------------
 
+# AddThis
+# https://www.addthis.com/
+addThis:
+  enable: false
+  pubid:
+
 # Share.js
 # https://github.com/overtrue/share.js
 sharejs:
@@ -635,9 +637,6 @@ index_top_img_height:
 category_ui: # 留空或 index
 tag_ui: # 留空或 index
 
-# Stretches the lines so that each line has equal width（文字向兩側對齊，對最後一行無效）
-text_align_justify: false
-
 # Website Background (設置網站背景)
 # can set it to color or image (可設置圖片 或者 顔色)
 # The formal of image: url(http://xxxxxx.com/xxx.jpg)
@@ -646,13 +645,8 @@ background:
 # Footer Background
 footer_bg: false
 
-# Add mask to header or footer (为 header 或 footer 添加黑色半透遮罩)
-mask:
-  header: true
-  footer: true
-
 # the position of bottom right button/default unit: px (右下角按鈕距離底部的距離/默認單位為px)
-rightside_bottom:
+rightside-bottom:
 
 # Enter transitions (開啓網頁進入效果)
 enter_transitions: true
@@ -705,7 +699,7 @@ click_heart:
   mobile: false
 
 # Mouse click effects: words (鼠標點擊效果: 文字)
-clickShowText:
+ClickShowText:
   enable: false
   text:
     # - I
@@ -797,13 +791,6 @@ fancybox: true
 # Tag Plugins settings (標籤外掛)
 # --------------------------------------
 
-# series (系列文章)
-series:
-  enable: true
-  orderBy: 'title' # Order by title or date
-  order: 1 # Sort of order. 1, asc for ascending; -1, desc for descending
-  number: true
-
 # abcjs (樂譜渲染)
 # See https://github.com/paulrosen/abcjs
 abcjs:
@@ -936,58 +923,59 @@ CDN:
   custom_format:
 
   option:
-    # abcjs_basic_js:
+    # main_css:
-    # activate_power_mode:
+    # main:
+    # utils:
+    # translate:
+    # local_search:
     # algolia_js:
     # algolia_search:
-    # aplayer_css:
+    # instantsearch:
-    # aplayer_js:
-    # artalk_css:
-    # artalk_js:
-    # blueimp_md5:
-    # busuanzi:
-    # canvas_fluttering_ribbon:
-    # canvas_nest:
-    # canvas_ribbon:
-    # click_heart:
-    # clickShowText:
-    # disqusjs:
-    # disqusjs_css:
-    # docsearch_css:
     # docsearch_js:
-    # egjs_infinitegrid:
+    # docsearch_css:
-    # fancybox:
+    # pjax:
-    # fancybox_css:
-    # fireworks:
-    # fontawesome:
     # gitalk:
     # gitalk_css:
+    # blueimp_md5:
+    # valine:
+    # disqusjs:
+    # disqusjs_css:
+    # twikoo:
+    # waline_js:
+    # waline_css:
     # giscus:
-    # instantpage:
-    # instantsearch:
-    # katex:
-    # katex_copytex:
-    # lazyload:
-    # local_search:
-    # main:
-    # main_css:
-    # mathjax:
-    # medium_zoom:
-    # mermaid:
-    # meting_js:
-    # pangu:
-    # prismjs_autoloader:
-    # prismjs_js:
-    # prismjs_lineNumber_js:
-    # pjax:
     # sharejs:
     # sharejs_css:
-    # snackbar:
+    # mathjax:
-    # snackbar_css:
+    # katex:
-    # translate:
+    # katex_copytex:
-    # twikoo:
+    # mermaid:
+    # canvas_ribbon:
+    # canvas_fluttering_ribbon:
+    # canvas_nest:
+    # lazyload:
+    # instantpage:
     # typed:
-    # utils:
+    # pangu:
-    # valine:
+    # fancybox_css:
-    # waline_css:
+    # fancybox:
-    # waline_js:
+    # medium_zoom:
+    # snackbar_css:
+    # snackbar:
+    # activate_power_mode:
+    # fireworks:
+    # click_heart:
+    # ClickShowText:
+    # fontawesome:
+    # flickr_justified_gallery_js:
+    # flickr_justified_gallery_css:
+    # aplayer_css:
+    # aplayer_js:
+    # meting_js:
+    # prismjs_js:
+    # prismjs_lineNumber_js:
+    # prismjs_autoloader:
+    # artalk_js:
+    # artalk_css:
+    # busuanzi:
+    # abcjs_basic_js:

languages/default.yml

@@ -3,9 +3,9 @@ footer:
   theme: Theme
 
 copy:
-  success: Copy Successful
+  success: Copy successfully
-  error: Copy Error
+  error: Copy error
-  noSupport: Browser Not Supported
+  noSupport: The browser does not support
 
 page:
   articles: Articles
@@ -15,15 +15,16 @@ page:
 
 card_post_count: comments
 
-no_title: Untitled
+sticky: Sticky
+no_title: No title
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word Count
+  wordcount: Word count
-  min2read: Reading Time
+  min2read: Reading time
-  min2read_unit: mins
+  min2read_unit: min
-  page_pv: Post Views
+  page_pv: Post View
   comments: Comments
   copyright:
     author: Author
@@ -47,8 +48,8 @@ search:
     hits_stats: '${hits} results found'
 
 pagination:
-  prev: Previous
+  prev: Previous Post
-  next: Next
+  next: Next Post
 
 comment: Comment
 
@@ -65,33 +66,32 @@ aside:
     headline: Info
     article_name: Article
     runtime:
-      name: Runtime
+      name: Run time
       unit: days
     last_push_date:
-      name: Last Update
+      name: Last Push
     site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
-  more_button: View More
+  more_button: More
   card_newest_comments:
-    headline: Latest Comments
+    headline: Newest Comments
     loading_text: loading...
-    error: Unable to retrieve comments, please check the configuration
+    error: Unable to get the data, please make sure the settings are correct.
-    zero: No comments
+    zero: No Comment
     image: image
     link: link
     code: code
-  card_toc: Contents
+  card_toc: Catalog
-  card_post_series: Series
 
 date_suffix:
-  just: Just now
+  just: Just
   min: minutes ago
   hour: hours ago
   day: days ago
   month: months ago
 
-donate: Sponsor
+donate: Donate
 share: Share
 
 rightside:
@@ -102,7 +102,7 @@ rightside:
   toc: Table Of Contents
   scroll_to_comment: Scroll To Comments
   setting: Setting
-  aside: Toggle between Single-column and Double-column
+  aside: Toggle between single-column and double-column
   chat: Chat
 
 copy_copyright:
@@ -112,12 +112,12 @@ copy_copyright:
   info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
 
 Snackbar:
-  chs_to_cht: You have switched to Traditional Chinese
+  chs_to_cht: Traditional Chinese Activated Manually
-  cht_to_chs: You have switched to Simplified Chinese
+  cht_to_chs: Simplified Chinese Activated Manually
-  day_to_night: You have switched to Dark Mode
+  day_to_night: Dark Mode Activated Manually
-  night_to_day: You have switched to Light Mode
+  night_to_day: Light Mode Activated Manually
 
 loading: Loading...
 load_more: Load More
 
-error404: Page Not Found
+error404: Page not found

languages/en.yml

@@ -3,9 +3,9 @@ footer:
   theme: Theme
 
 copy:
-  success: Copy Successful
+  success: Copy successfully
-  error: Copy Error
+  error: Copy error
-  noSupport: Browser Not Supported
+  noSupport: The browser does not support
 
 page:
   articles: Articles
@@ -15,15 +15,16 @@ page:
 
 card_post_count: comments
 
-no_title: Untitled
+sticky: Sticky
+no_title: No title
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word Count
+  wordcount: Word count
-  min2read: Reading Time
+  min2read: Reading time
-  min2read_unit: mins
+  min2read_unit: min
-  page_pv: Post Views
+  page_pv: Post View
   comments: Comments
   copyright:
     author: Author
@@ -47,8 +48,8 @@ search:
     hits_stats: '${hits} results found'
 
 pagination:
-  prev: Previous
+  prev: Previous Post
-  next: Next
+  next: Next Post
 
 comment: Comment
 
@@ -65,44 +66,43 @@ aside:
     headline: Info
     article_name: Article
     runtime:
-      name: Runtime
+      name: Run time
       unit: days
     last_push_date:
-      name: Last Update
+      name: Last Push
     site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
-  more_button: View More
+  more_button: More
   card_newest_comments:
-    headline: Latest Comments
+    headline: Newest Comments
     loading_text: loading...
-    error: Unable to retrieve comments, please check the configuration
+    error: Unable to get the data, please make sure the settings are correct.
-    zero: No comments
+    zero: No Comment
     image: image
     link: link
     code: code
-  card_toc: Contents
+  card_toc: Catalog
-  card_post_series: Series
 
 date_suffix:
-  just: Just now
+  just: Just
   min: minutes ago
   hour: hours ago
   day: days ago
   month: months ago
 
-donate: Sponsor
+donate: Donate
 share: Share
 
 rightside:
   readmode_title: Read Mode
-  translate_title: Toggle Between Traditional Chinese And Simplified Chinese
+  translate_title: Switch Between Traditional Chinese And Simplified Chinese
-  night_mode_title: Toggle Between Light And Dark Mode
+  night_mode_title: Switch Between Light And Dark Mode
   back_to_top: Back To Top
   toc: Table Of Contents
   scroll_to_comment: Scroll To Comments
   setting: Setting
-  aside: Toggle between Single-column and Double-column
+  aside: Toggle between single-column and double-column
   chat: Chat
 
 copy_copyright:
@@ -112,12 +112,12 @@ copy_copyright:
   info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
 
 Snackbar:
-  chs_to_cht: You have switched to Traditional Chinese
+  chs_to_cht: Traditional Chinese Activated Manually
-  cht_to_chs: You have switched to Simplified Chinese
+  cht_to_chs: Simplified Chinese Activated Manually
-  day_to_night: You have switched to Dark Mode
+  day_to_night: Dark Mode Activated Manually
-  night_to_day: You have switched to Light Mode
+  night_to_day: Light Mode Activated Manually
 
 loading: Loading...
 load_more: Load More
 
-error404: Page Not Found
+error404: Page not found

languages/zh-CN.yml

@@ -15,6 +15,7 @@ page:
 
 card_post_count: 条评论
 
+sticky: 置顶
 no_title: 无题
 
 post:
@@ -83,7 +84,6 @@ aside:
     link: 链接
     code: 代码
   card_toc: 目录
-  card_post_series: 系列文章
 
 date_suffix:
   just: 刚刚
@@ -92,7 +92,7 @@ date_suffix:
   day: 天前
   month: 个月前
 
-donate: 赞助
+donate: 打赏
 share: 分享
 
 rightside:
@@ -113,8 +113,8 @@ copy_copyright:
   info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
 
 Snackbar:
-  chs_to_cht: 你已切换为繁体中文
+  chs_to_cht: 你已切换为繁体
-  cht_to_chs: 你已切换为简体中文
+  cht_to_chs: 你已切换为简体
   day_to_night: 你已切换为深色模式
   night_to_day: 你已切换为浅色模式
 

languages/zh-TW.yml

@@ -15,7 +15,8 @@ page:
 
 card_post_count: 條評論
 
-no_title: 無標題
+sticky: 置頂
+no_title: 無題
 
 post:
   created: 發表於
@@ -83,7 +84,6 @@ aside:
     link: 連結
     code: 程式碼
   card_toc: 目錄
-  card_post_series: 文章系列
 
 date_suffix:
   just: 剛剛
@@ -92,14 +92,14 @@ date_suffix:
   day: 天前
   month: 個月前
 
-donate: 贊助
+donate: 打賞
 share: 分享
 
 rightside:
   readmode_title: 閱讀模式
   translate_title: 簡繁轉換
   night_mode_title: 淺色和深色模式轉換
-  back_to_top: 返回頂部
+  back_to_top: 回到頂部
   toc: 目錄
   scroll_to_comment: 直達評論
   setting: 設定
@@ -110,11 +110,11 @@ copy_copyright:
   author: 作者
   link: 連結
   source: 來源
-  info: 著作權歸作者所有。商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
+  info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
 
 Snackbar:
-  chs_to_cht: 你已切換為繁體中文
+  chs_to_cht: 你已切換為繁體
-  cht_to_chs: 你已切換為簡體中文
+  cht_to_chs: 你已切換為簡體
   day_to_night: 你已切換為深色模式
   night_to_day: 你已切換為淺色模式
 

layout/archive.pug

@@ -3,6 +3,7 @@ extends includes/layout.pug
 block content
   include ./includes/mixins/article-sort.pug
   #archive
-    .article-sort-title= `${_p('page.articles')} - ${getArchiveLength()}`
+    - const archiveLength = findArchiveLength(fragment_cache)
+    .article-sort-title= _p('page.articles') + ' - ' + archiveLength
     +articleSort(page.posts)
     include includes/pagination.pug

layout/includes/head.pug

@@ -55,13 +55,14 @@ if theme.fancybox
 !=partial('includes/head/analytics', {}, {cache: true})
 
 //- font
-if theme.blog_title_font && theme.blog_title_font.font_link
+if theme.blog_title_font &&　theme.blog_title_font.font_link
   link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")
 
 //- global config
 !=partial('includes/head/config', {}, {cache: true})
 
 include ./head/config_site.pug
+include ./head/noscript.pug
 
 !=fragment_cache('injectHeadJs', function(){return inject_head_js()})
 

layout/includes/head/config.pug

@@ -88,7 +88,7 @@
   }
 
 script.
-  const GLOBAL_CONFIG = {
+  const GLOBAL_CONFIG = { 
     root: '!{config.root}',
     algolia: !{algolia},
     localSearch: !{localSearch},
@@ -115,9 +115,11 @@ script.
     copyright: !{copyright},
     lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
     Snackbar: !{Snackbar},
-    infinitegrid: {
+    source: {
-      js: '!{url_for(theme.asset.egjs_infinitegrid)}',
+      justifiedGallery: {
-      buttonText: '!{_p("load_more")}'
+        js: '!{url_for(theme.asset.flickr_justified_gallery_js)}',
+        css: '!{url_for(theme.asset.flickr_justified_gallery_css)}'
+      }
     },
     isPhotoFigcaption: !{theme.photofigcaption},
     islazyload: !{theme.lazyload.enable},
@@ -125,6 +127,5 @@ script.
     percent: {
       toc: !{theme.toc.scroll_percent},
       rightside: !{theme.rightside_scroll_percent},
-    },
+    }
-    autoDarkmode: !{theme.darkmode.enable && theme.darkmode.autoChangeMode === 1}
   }

layout/includes/head/noscript.pug

@@ -0,0 +1,14 @@
+noscript. 
+  <style type="text/css">
+    #nav {
+      opacity: 1
+    }
+    .justified-gallery img {
+      opacity: 1
+    }
+
+    #recent-posts time,
+    #post-meta time {
+      display: inline !important
+    }
+  </style>

layout/includes/head/preconnect.pug

@@ -1,20 +1,4 @@
--
+link(rel="preconnect" href="//cdn.jsdelivr.net")
-  const { internal_provider, third_party_provider, custom_format } = theme.CDN
-  const providers = {
-    'jsdelivr': '//cdn.jsdelivr.net',
-    'cdnjs': '//cdnjs.cloudflare.com',
-    'unpkg': '//unpkg.com',
-    'custom': custom_format && custom_format.match(/^((https?:)?(\/\/[^/]+)|([^/]+))(\/|$)/)[1]
-  }
--
-
-if internal_provider === third_party_provider && internal_provider !== 'local'
-  link(rel="preconnect" href=providers[internal_provider])
-else 
-  if internal_provider !== 'local'
-    link(rel="preconnect" href=providers[internal_provider])
-  if third_party_provider !== 'local'
-  link(rel="preconnect" href=providers[third_party_provider])
 
 if theme.google_analytics
   link(rel="preconnect" href="//www.google-analytics.com" crossorigin='')

layout/includes/header/index.pug

@@ -44,7 +44,7 @@ header#page-header(class=`${isHomeClass+isFixedClass}` style=bg_img)
             span#subtitle
         if(theme.social)
           #site_social_icons
-            !=partial('includes/header/social', {}, {cache: true})
+            !=fragment_cache('social', function(){return partial('includes/header/social')})
       #scroll-down
         i.fas.fa-angle-down.scroll-down-effects
     else

layout/includes/header/post-info.pug

@@ -102,12 +102,14 @@
         case whichCount
           when 'Disqus'
             +countBlock
-              a.disqus-comment-count(href=full_url_for(page.path) + '#post-comment')
+              span.disqus-comment-count
-                i.fa-solid.fa-spinner.fa-spin
+                a(href=full_url_for(page.path) + '#disqus_thread')
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Disqusjs'
             +countBlock
-              a.disqusjs-comment-count(href=full_url_for(page.path) + '#post-comment')
+              a(href=full_url_for(page.path) + '#disqusjs')
-                i.fa-solid.fa-spinner.fa-spin
+                span.disqus-comment-count(data-disqus-url=full_url_for(page.path))
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Valine'
             +countBlock
               a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")

layout/includes/loading/fullpage-loading.pug

@@ -9,25 +9,21 @@
     .loading-word= _p('loading')
 
 script.
-  (()=>{
+  const preloader = {
-    const $loadingBox = document.getElementById('loading-box')
+    endLoading: () => {
-    const $body = document.body
+      document.body.style.overflow = '';
-    const preloader = {
+      document.getElementById('loading-box').classList.add("loaded")
-      endLoading: () => {
+    },
-        $body.style.overflow = ''
+    initLoading: () => {
-        $loadingBox.classList.add('loaded')
+      document.body.style.overflow = 'hidden';
-      },
+      document.getElementById('loading-box').classList.remove("loaded")
-      initLoading: () => {
-        $body.style.overflow = 'hidden'
-        $loadingBox.classList.remove('loaded')
-      }
     }
+  }
 
-    preloader.initLoading()
+  preloader.initLoading()
-    window.addEventListener('load',() => { preloader.endLoading() })
+  window.addEventListener('load',()=> { preloader.endLoading() })
 
-    if (!{theme.pjax && theme.pjax.enable}) {
+  if (!{theme.pjax && theme.pjax.enable}) {
-      document.addEventListener('pjax:send', () => { preloader.initLoading() })
+    document.addEventListener('pjax:send', () => { preloader.initLoading() })
-      document.addEventListener('pjax:complete', () => { preloader.endLoading() })
+    document.addEventListener('pjax:complete', () => { preloader.endLoading() })
-    }
+  }
-  })()

layout/includes/mixins/post-ui.pug

@@ -19,11 +19,13 @@ mixin postUI(posts)
             else
               div.post-bg(style=`background: ${post_cover}`)
       .recent-post-info(class=no_cover)
-        a.article-title(href=url_for(link) title=title)
+        a.article-title(href=url_for(link) title=title)= title
-          if (is_home() && (article.top || article.sticky > 0))
-            i.fas.fa-thumbtack.sticky
-          = title
         .article-meta-wrap
+          if (is_home() && (article.top || article.sticky > 0))
+            span.article-meta
+              i.fas.fa-thumbtack.sticky
+              span.sticky= _p('sticky')
+              span.article-meta-separator |
           if (theme.post_meta.page.date_type)
             span.post-meta-date
               if (theme.post_meta.page.date_type === 'both')
@@ -68,13 +70,17 @@ mixin postUI(posts)
                 block
               span.article-meta-label= ' ' + _p('card_post_count')
           
-          if theme.comments.card_post_count && theme.comments.use
+          if theme.comments.card_post_count
             case theme.comments.use[0]
               when 'Disqus'
+                +countBlockInIndex
+                  a(href=full_url_for(link) + '#disqus_thread')
+                    i.fa-solid.fa-spinner.fa-spin
               when 'Disqusjs'
                 +countBlockInIndex
-                  a.disqus-count(href=full_url_for(link) + '#post-comment')
+                  a(href=full_url_for(link) + '#disqusjs')
-                    i.fa-solid.fa-spinner.fa-spin
+                    span.disqus-comment-count(data-disqus-url=full_url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Valine'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
@@ -83,7 +89,7 @@ mixin postUI(posts)
               when 'Waline'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
-                    span.waline-comment-count(data-path=url_for(link))
+                    span.waline-comment-count(id=url_for(link))
                       i.fa-solid.fa-spinner.fa-spin
               when 'Twikoo'
                 +countBlockInIndex

layout/includes/page/flink.pug

@@ -1,10 +1,7 @@
 #article-container
   .flink
-    - let { content, random, flink_url } = page
+    - let pageContent = page.content
-    - let pageContent = content
+    if page.flink_url
-
-    if flink_url || random
-      - const linkData = flink_url ? false : site.data.link || false
       script.
         (()=>{
           const replaceSymbol = (str) => {
@@ -12,45 +9,35 @@
           }
 
           let result = ""
-          const add = (str) => {
+          fetch("!{url_for(page.flink_url)}")
-            for(let i = 0; i < str.length; i++){
+            .then(response => response.json())
-              const replaceClassName = replaceSymbol(str[i].class_name)
+            .then(str => {
-              const className = str[i].class_name ? `<h2 id="${replaceClassName}"><a href="#${replaceClassName}" class="headerlink" title="${str[i].class_name}"></a>${str[i].class_name}</h2>` : ""
+              for(let i = 0; i < str.length; i++){
-              const classDesc = str[i].class_desc ? `<div class="flink-desc">${str[i].class_desc}</div>` : ""
+                const replaceClassName = replaceSymbol(str[i].class_name)
+                const className = str[i].class_name ? `<h2 id="${replaceClassName}"><a href="#${replaceClassName}" class="headerlink" title="${str[i].class_name}"></a>${str[i].class_name}</h2>` : ""
+                const classDesc = str[i].class_desc ? `<div class="flink-desc">${str[i].class_desc}</div>` : ""
+                
+                let listResult = ""
+                const lists = str[i].link_list
+                for(let j = 0; j < lists.length; j++){
+                  listResult += `
+                    <div class="flink-list-item">
+                      <a href="${lists[j].link}" title="${lists[j].name}" target="_blank">
+                        <div class="flink-item-icon">
+                          <img class="no-lightbox" src="${lists[j].avatar}" onerror='this.onerror=null;this.src="!{url_for(theme.error_img.flink)}"' alt="${lists[j].name}" />
+                        </div>
+                        <div class="flink-item-name">${lists[j].name}</div> 
+                        <div class="flink-item-desc" title="${lists[j].descr}">${lists[j].descr}</div>
+                      </a>
+                    </div>`
+                }
 
-              let listResult = ""
+                result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
-              const lists = str[i].link_list
-              if (!{random === true}) {
-                lists.sort(() => Math.random() - 0.5)
-              }
-              for(let j = 0; j < lists.length; j++){
-                listResult += `
-                  <div class="flink-list-item">
-                    <a href="${lists[j].link}" title="${lists[j].name}" target="_blank">
-                      <div class="flink-item-icon">
-                        <img class="no-lightbox" src="${lists[j].avatar}" onerror='this.onerror=null;this.src="!{url_for(theme.error_img.flink)}"' alt="${lists[j].name}" />
-                      </div>
-                      <div class="flink-item-name">${lists[j].name}</div> 
-                      <div class="flink-item-desc" title="${lists[j].descr}">${lists[j].descr}</div>
-                    </a>
-                  </div>`
               }
 
-              result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+              document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
-            }
+              window.lazyLoadInstance && window.lazyLoadInstance.update()
-
+            })
-            document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
-            window.lazyLoadInstance && window.lazyLoadInstance.update()
-          }
-
-          const linkData = !{JSON.stringify(linkData)}
-          if (!{Boolean(flink_url)}) {
-            fetch("!{url_for(flink_url)}")
-              .then(response => response.json())
-              .then(add)
-          } else if (linkData) {
-            add(linkData)
-          }
         })()
 
     else
@@ -80,3 +67,4 @@
 
         - pageContent = result + pageContent
     != pageContent
+

layout/includes/post/post-copyright.pug

@@ -5,19 +5,13 @@ if theme.post_copyright.enable && page.copyright !== false
   - let info = page.copyright_info || _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
   .post-copyright
     .post-copyright__author
-      span.post-copyright-meta
+      span.post-copyright-meta= _p('post.copyright.author') + ": "
-        i.fas.fa-circle-user.fa-fw
-        = _p('post.copyright.author') + ": "
       span.post-copyright-info
         a(href=authorHref)=author
     .post-copyright__type
-      span.post-copyright-meta
+      span.post-copyright-meta= _p('post.copyright.link') + ": "
-        i.fas.fa-square-arrow-up-right.fa-fw
-        = _p('post.copyright.link') + ": "
       span.post-copyright-info
         a(href=url_for(url))= theme.post_copyright.decode ? decodeURI(url) : url
     .post-copyright__notice
-      span.post-copyright-meta
+      span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
-        i.fas.fa-circle-exclamation.fa-fw
-        = _p('post.copyright.copyright_notice') + ": "
       span.post-copyright-info!= info

layout/includes/post/reward.pug

@@ -1,7 +1,7 @@
 .post-reward
   .reward-button
     i.fas.fa-qrcode
-    = theme.reward.text || _p('donate')
+    = ' ' + _p('donate')
   .reward-main
     ul.reward-all
       each item in theme.reward.QR_code

layout/includes/rightside.pug

@@ -23,7 +23,7 @@ mixin rightsideItem(array)
             i.fas.fa-list-ul
       when 'chat'
         if chat_btn
-          button#chat-btn(type="button" title=_p("rightside.chat"))
+          button#chat_btn(type="button" title=_p("rightside.chat"))
             i.fas.fa-sms
       when 'comment'
         if commentsJsLoad
@@ -42,15 +42,15 @@ mixin rightsideItem(array)
   #rightside-config-show
     if enable
       if hide
-        button#rightside-config(type="button" title=_p("rightside.setting"))
+        button#rightside_config(type="button" title=_p("rightside.setting"))
           i.fas.fa-cog.fa-spin
     else
       if is_post()
         if (readmode || translate.enable || (darkmode.enable && darkmode.button))
-          button#rightside-config(type="button" title=_p("rightside.setting"))
+          button#rightside_config(type="button" title=_p("rightside.setting"))
             i.fas.fa-cog.fa-spin
       else if translate.enable || (darkmode.enable && darkmode.button)
-        button#rightside-config(type="button" title=_p("rightside.setting"))
+        button#rightside_config(type="button" title=_p("rightside.setting"))
           i.fas.fa-cog.fa-spin
 
     if showArray

layout/includes/sidebar.pug

@@ -14,5 +14,5 @@
         .headline= _p('aside.categories') 
         .length-num= site.categories.length
 
-    hr.custom-hr
+    hr
     !=partial('includes/header/menu_item', {}, {cache: true})

layout/includes/third-party/abcjs/abcjs.pug

@@ -1,15 +1,15 @@
 script.
   (() => {
-    const abcjsInit = () => {
+    function abcjsInit() {
-      const abcjsFn = () => {
+      function abcjsFn() {
-        document.querySelectorAll(".abc-music-sheet").forEach(ele => {
+        for (let abcContainer of document.getElementsByClassName("abc-music-sheet")) {
-          ABCJS.renderAbc(ele, ele.innerHTML, {responsive: 'resize'})
+          ABCJS.renderAbc(abcContainer, abcContainer.innerHTML, {responsive: 'resize'})
-        })
+        }
       }
       
       typeof ABCJS === 'object' ? abcjsFn()
         : getScript('!{url_for(theme.asset.abcjs_basic_js)}').then(abcjsFn)
     }
 
-    window.pjax ? abcjsInit() : window.addEventListener('load', abcjsInit)
+    window.pjax ? abcjsInit() : document.addEventListener('DOMContentLoaded', abcjsInit)
   })()

layout/includes/third-party/abcjs/index.pug

@@ -1,4 +1,4 @@
-if theme.abcjs && theme.abcjs.enable
+if theme.abcjs.enable
   if theme.abcjs.per_page
     if is_post() || is_page()
       include ./abcjs.pug

layout/includes/third-party/card-post-count/artalk.pug

@@ -2,34 +2,19 @@
 
 script.
   (() => {
-    const getArtalkCount = async() => {
+    const getArtalkCount = () => {
-      try {
+      const runWidget = () => {
-        const eleGroup = document.querySelectorAll('#recent-posts .artalk-count')
+        Artalk.LoadCountWidget({
-        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-page-key'))
+          server: '!{server}',
-
+          site: '!{site}',
-        const headerList = {
+          countEl: '.artalk-count'
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Origin': window.location.origin
-          },
-          body: new URLSearchParams({
-            'site_name': '!{site}',
-            'type':'page_comment',
-            'page_keys': keyArray
-          })
-        }
-
-        const res = await fetch('!{server}/api/stat', headerList)
-        const result = await res.json()
-
-        keyArray.forEach((key, index) => {
-          eleGroup[index].textContent = result.data[key] || 0
         })
-      } catch (err) {
-        console.error(err)
       }
+
+      if (typeof Artalk === 'function') runWidget()
+      else getScript('!{theme.asset.artalk_js}').then(runWidget)
     }
 
+
     window.pjax ? getArtalkCount() : window.addEventListener('load', getArtalkCount)
   })()

layout/includes/third-party/card-post-count/disqus.pug

@@ -1,25 +1,16 @@
-- const { shortname, apikey } = theme.disqus
 script.
   (() => {
-    const getCount = async () => {
+    const getCount = () => {
-      try {
+      if (window.DISQUSWIDGETS === undefined) {
-        const eleGroup = document.querySelectorAll('#recent-posts .disqus-count')
+        var d = document, s = d.createElement('script');
-        const cleanedLinks = Array.from(eleGroup).map(i => `thread:link=${i.href.replace(/#post-comment$/, '')}`);
+        s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
-
+        s.id = 'dsq-count-scr';
-        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{shortname}&api_key=!{apikey}&${cleanedLinks.join('&')}`,{
+        (d.head || d.body).appendChild(s);
-          method: 'GET'
+      } else {
-        })
+        DISQUSWIDGETS.getCount({reset: true});
-        const result = await res.json()
-
-        eleGroup.forEach(i => {
-          const cleanedLink = i.href.replace(/#post-comment$/, '')
-          const urlData = result.response.find(data => data.link === cleanedLink) || { posts: 0 }
-          i.textContent = urlData.posts
-        })
-      } catch (err) {
-        console.error(err)
       }
     }
 
     window.pjax ? getCount() : window.addEventListener('load', getCount)
+
   })()

layout/includes/third-party/card-post-count/twikoo.pug

@@ -18,7 +18,7 @@ script.
           includeReply: false
         }).then(function (res) {
           document.querySelectorAll('#recent-posts .twikoo-count').forEach((item,index) => {
-            item.textContent = res[index].count
+            item.innerText = res[index].count
           })
         }).catch(function (err) {
           console.log(err)

layout/includes/third-party/card-post-count/waline.pug

@@ -1,20 +1,17 @@
-- const serverURL = theme.waline.serverURL.replace(/\/$/, '')
 script.
   (() => {
-    async function loadWaline () {
+    function loadWaline () {
-      try {
+      function initWaline () {
-        const eleGroup = document.querySelectorAll('#recent-posts .waline-comment-count')
+        let initData = {
-        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-path'))
+          el: null,
-
+          serverURL: '!{theme.waline.serverURL}',
-        const res = await fetch(`!{serverURL}/api/comment?type=count&url=${keyArray}`, { method: 'GET' })
+          comment: true
-        const result = await res.json()
+        }
-        
+        const waline = Waline.init(initData)
-        result.data.forEach((count, index) => {
-          eleGroup[index].textContent = count
-        })
-      } catch (err) {
-        console.error(err)
       }
+
+      if (typeof Waline === 'object') initWaline() 
+      else getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
     }
 
     window.pjax ? loadWaline() : window.addEventListener('load', loadWaline)

layout/includes/third-party/chat/chatra.pug

@@ -1,50 +1,33 @@
 //- https://chatra.io/help/api/
 script.
-  (() => {
+  (function(d, w, c) {
-    const isChatBtn = !{theme.chat_btn}
+      w.ChatraID = '#{theme.chatra.id}';
-    const isChatHideShow = !{theme.chat_hide_show}
+      var s = d.createElement('script');
+      w[c] = w[c] || function() {
+          (w[c].q = w[c].q || []).push(arguments);
+      };
+      s.async = true;
+      s.src = 'https://call.chatra.io/chatra.js';
+      if (d.head) d.head.appendChild(s);
+  })(document, window, 'Chatra');
 
-    if (isChatBtn) {
+  if (!{theme.chat_btn}) {
-      const close = () => {
+    var chatBtnFn = () => {
-        Chatra('minimizeWidget')
+      var chatBtn = document.getElementById("chat_btn")
+      chatBtn.addEventListener("click", function(){
+        Chatra('openChat')
+      });
+    }
+    chatBtnFn()
+  } else {
+    if (!{theme.chat_hide_show}) {
+      function chatBtnHide () {
         Chatra('hide')
       }
-
+      function chatBtnShow () {
-      const open = () => {
-        Chatra('openChat', true)
         Chatra('show')
       }
-
-      window.ChatraSetup = {
-        startHidden: true
-      }
-    
-      window.chatBtnFn = () => {
-        const isShow = document.getElementById('chatra').classList.contains('chatra--expanded')
-        isShow ? close() : open()
-      }
-    } else if (isChatHideShow) {
-      window.chatBtn = {
-        hide: () => {
-          Chatra('hide')
-        },
-        show: () => {
-          Chatra('show')
-        }
-      }
     }
-
+  }
-    (function(d, w, c) {
-      w.ChatraID = '#{theme.chatra.id}'
-      var s = d.createElement('script')
-      w[c] = w[c] || function() {
-          (w[c].q = w[c].q || []).push(arguments)
-      }
-      s.async = true
-      s.src = 'https://call.chatra.io/chatra.js'
-      if (d.head) d.head.appendChild(s)
-    })(document, window, 'Chatra')
-
-  })()
 
 

layout/includes/third-party/chat/crisp.pug

@@ -1,45 +1,36 @@
 script.
-  (() => {
+  window.$crisp = [];
-    window.$crisp = [];
+  window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}";
-    window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}";
+  (function () {
-    (function () {
+    d = document;
-      d = document;
+    s = d.createElement("script");
-      s = d.createElement("script");
+    s.src = "https://client.crisp.chat/l.js";
-      s.src = "https://client.crisp.chat/l.js";
+    s.async = 1;
-      s.async = 1;
+    d.getElementsByTagName("head")[0].appendChild(s);
-      d.getElementsByTagName("head")[0].appendChild(s);
+  })();
-    })();
+  $crisp.push(["safe", true])
-    $crisp.push(["safe", true])
 
-    const isChatBtn = !{theme.chat_btn}
+  if (!{theme.chat_btn}) {
-    const isChatHideShow = !{theme.chat_hide_show}
+    $crisp.push(["do", "chat:hide"])
-
+    $crisp.push(["on", "chat:closed", function() {
-    if (isChatBtn) {
+      $crisp.push(["do", "chat:hide"])
-      const open = () => {
+    }])
+    var chatBtnFn = () => {
+      var chatBtn = document.getElementById("chat_btn")
+      chatBtn.addEventListener("click", function(){
         $crisp.push(["do", "chat:show"])
         $crisp.push(["do", "chat:open"])
-      }
 
-      const close = () => {
+      });
+    }
+    chatBtnFn()
+  } else {
+    if (!{theme.chat_hide_show}) {
+      function chatBtnHide () {
         $crisp.push(["do", "chat:hide"])
       }
-
+      function chatBtnShow () {
-      close()
+        $crisp.push(["do", "chat:show"])
-      $crisp.push(["on", "chat:closed", function() {
-        close()
-      }])
-
-      window.chatBtnFn = () => {
-        $crisp.is("chat:visible") ? close() : open()
-      }
-    } else if (isChatHideShow) {
-      window.chatBtn = {
-        hide: () => {
-          $crisp.push(["do", "chat:hide"])
-        },
-        show: () => {
-          $crisp.push(["do", "chat:show"])
-        }
       }
     }
-  })()
+  }

layout/includes/third-party/chat/daovoice.pug

@@ -1,40 +1,40 @@
 //- https://guide.daocloud.io/daovoice/javascript-api-5869833.html
 script.
-  (() => {
+  (function(i,s,o,g,r,a,m){i["DaoVoiceObject"]=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;a.charset="utf-8";m.parentNode.insertBefore(a,m)})(window,document,"script",('https:' == document.location.protocol ? 'https:' : 'http:') + "//widget.daovoice.io/widget/!{theme.daovoice.app_id}.js","daovoice")
-    (function(i,s,o,g,r,a,m){i["DaoVoiceObject"]=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;a.charset="utf-8";m.parentNode.insertBefore(a,m)})(window,document,"script",('https:' == document.location.protocol ? 'https:' : 'http:') + "//widget.daovoice.io/widget/!{theme.daovoice.app_id}.js","daovoice")
 
-    const isChatBtn = !{theme.chat_btn}
+script.
-    const isChatHideShow = !{theme.chat_hide_show}
+  var isChatBtn = !{theme.chat_btn}
+  daovoice('init', {
+    app_id: '!{theme.daovoice.app_id}',},{
+    launcher: { 
+       disableLauncherIcon: isChatBtn // 悬浮 ICON 是否显示
+    },
+  });
+  daovoice('update');
 
-    daovoice('init', {
+  if (isChatBtn) {
-      app_id: '!{theme.daovoice.app_id}',},{
+    var chatBtnFn = () => {
-      launcher: { 
+      var chatBtn = document.getElementById("chat_btn")
-        disableLauncherIcon: isChatBtn
+      chatBtn.addEventListener("click", function(){
-      },
+        daovoice('show')
-    });
+      });
-    daovoice('update');
+    }
-
+    chatBtnFn()
-    if (isChatBtn) {
+  } else {
-      window.chatBtnFn = () => {
+    if (!{theme.chat_hide_show}) {
-        const isShow = document.getElementById('daodream-messenger').classList.contains('daodream-messenger-active')
+      function chatBtnHide () {
-        isShow ? daovoice('hide') : daovoice('show')
+        daovoice('update', {},{
+          launcher: { 
+          disableLauncherIcon: true // 悬浮 ICON 是否显示
+          },
+        });
       }
-    } else if (isChatHideShow) {
+      function chatBtnShow () {
-      window.chatBtn = {
+        daovoice('update', {},{
-        hide: () => {
+          launcher: { 
-          daovoice('update', {},{
+          disableLauncherIcon: false // 悬浮 ICON 是否显示
-            launcher: {
+          },
-              disableLauncherIcon: true
+        });
-            }
-          })
-        },
-        show: () => {
-          daovoice('update', {}, {
-            launcher: {
-              disableLauncherIcon: false
-            }
-          })
-        }
       }
     }
-  })()
+  }

layout/includes/third-party/chat/messenger.pug

@@ -4,41 +4,39 @@
 #fb-customer-chat.fb-customerchat(page_id=pageID attribution='biz_inbox')
 
 script.
-  (() => {
+  document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
-    document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
 
-    window.fbAsyncInit = function() {
+  window.fbAsyncInit = function() {
-      FB.init({
+    FB.init({
-        xfbml: true,
+      xfbml: true,
-        version: 'v16.0'
+      version: 'v16.0'
+    });
+  };
+
+  (function(d, s, id) {
+    var js, fjs = d.getElementsByTagName(s)[0];
+    if (d.getElementById(id)) return;
+    js = d.createElement(s); js.id = id;
+    js.src = 'https://connect.facebook.net/!{lang}/sdk/xfbml.customerchat.js';
+    fjs.parentNode.insertBefore(js, fjs);
+  }(document, 'script', 'facebook-jssdk'));
+
+  if (!{theme.chat_btn}) {
+    var chatBtnFn = () => {
+      var chatBtn = document.getElementById("chat_btn")
+      chatBtn.addEventListener("click", function(){
+        FB.CustomerChat.show();
       });
-    };
+    }
-
+    chatBtnFn()
-    (function(d, s, id) {
+  } else {
-      var js, fjs = d.getElementsByTagName(s)[0];
+    if (!{theme.chat_hide_show}) {
-      if (d.getElementById(id)) return;
+      function chatBtnHide () {
-      js = d.createElement(s); js.id = id;
+        FB.CustomerChat.hide()
-      js.src = 'https://connect.facebook.net/!{lang}/sdk/xfbml.customerchat.js';
-      fjs.parentNode.insertBefore(js, fjs);
-    }(document, 'script', 'facebook-jssdk'));
-
-    const isChatBtn = !{theme.chat_btn}
-    const isChatHideShow = !{theme.chat_hide_show}
-
-    if (isChatBtn) {
-      window.chatBtnFn = () => {
-        const isShow = document.querySelector('.fb_customer_chat_bounce_in_v2')
-        isShow ? FB.CustomerChat.hide() : FB.CustomerChat.show()
       }
-    } else if (isChatHideShow) {
+      function chatBtnShow () {
-      window.chatBtn = {
+        FB.CustomerChat.show(false)
-        hide: () => {
-          FB.CustomerChat.hide()
-        },
-        show: () => {
-          FB.CustomerChat.show(false)
-        }
       }
     }
-  })()
+  }
 

layout/includes/third-party/chat/tidio.pug

@@ -1,45 +1,41 @@
 script(src=`//code.tidio.co/${theme.tidio.public_key}.js` async)
-script.
-  (() => {
-    const isChatBtn = !{theme.chat_btn}
-    const isChatHideShow = !{theme.chat_hide_show}
 
-    if (isChatBtn) {
+if theme.chat_btn
-      let isShow = false
+  script.
-      const close = () => {
+    function onTidioChatApiReady() {
-        window.tidioChatApi.hide()
+      window.tidioChatApi.hide();
-        isShow = false
+      window.tidioChatApi.on("close", function() {
-      }
+        window.tidioChatApi.hide();
-      
+      });
-      const open = () => {
+    }
-        window.tidioChatApi.open()
+    if (window.tidioChatApi) {
-        window.tidioChatApi.show()
+      window.tidioChatApi.on("ready", onTidioChatApiReady);
-        isShow = true
+    } else {
-      }
+      document.addEventListener("tidioChat-ready", onTidioChatApiReady);
+    }
 
-      const onTidioChatApiReady = () => {
+    var chatBtnFn = () => {
-        window.tidioChatApi.hide()
+      document.getElementById("chat_btn").addEventListener("click", function(){
-        window.tidioChatApi.on("close", close)
+        window.tidioChatApi.show();
-      }
+        window.tidioChatApi.open();
+      });
+    }
+    chatBtnFn()
+
+else if theme.chat_hide_show
+  script.
+    function chatBtnHide () {
       if (window.tidioChatApi) {
-        window.tidioChatApi.on("ready", onTidioChatApiReady)
+        //- window.tidioChatApi.hide();
-      } else {
+        document.getElementById('tidio-chat').style.display= 'none'
-        document.addEventListener("tidioChat-ready", onTidioChatApiReady)
-      }
-
-      window.chatBtnFn = () => {
-        if (!window.tidioChatApi) return
-        isShow ? close() : open()
-      }
-    } else if (isChatHideShow) {
-      window.chatBtn = {
-        hide: () => {
-          window.tidioChatApi && window.tidioChatApi.hide()
-        },
-        show: () => {
-          window.tidioChatApi && window.tidioChatApi.show()
-        }
       }
     }
-  })()
+
+    function chatBtnShow () {
+      if (window.tidioChatApi) {
+        //- window.tidioChatApi.show();
+        document.getElementById('tidio-chat').style.display= 'block'
+      } 
+    }
+
 

layout/includes/third-party/comments/artalk.pug

@@ -1,9 +1,8 @@
 - const { server, site, option } = theme.artalk
-- const { use, lazyload } = theme.comments
 
 script.
-  (() => {
+  function loadArtalk () {
-    const initArtalk = () => {
+    function initArtalk () {
       window.artalkItem = new Artalk(Object.assign({
         el: '#artalk-wrap',
         server: '!{server}',
@@ -12,41 +11,28 @@ script.
         darkMode: document.documentElement.getAttribute('data-theme') === 'dark',
         countEl: '.artalk-count'
       },!{JSON.stringify(option)}))
-
-      if (GLOBAL_CONFIG.lightbox === 'null') return
-      window.artalkItem.use(ctx => {
-        ctx.on('list-loaded', () => {
-          ctx.getCommentList().forEach(comment => {
-            const $content = comment.getRender().$content
-            btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])'))
-          })
-        })
-      })
     }
 
-    const loadArtalk = async () => {
+    if (typeof window.artalkItem === 'object') setTimeout(()=>{initArtalk()},200)
-      if (typeof window.artalkItem === 'object') initArtalk()
+    else {
-      else {
+      getCSS('!{theme.asset.artalk_css}')
-        await getCSS('!{theme.asset.artalk_css}')
+      typeof Artalk !== 'function' ? getScript('!{theme.asset.artalk_js}').then(initArtalk)
-        await getScript('!{theme.asset.artalk_js}')
+                                  : setTimeout(()=>{initArtalk()},200)
-        initArtalk()
-      }
     }
+  }
+
+  document.getElementById('darkmode').addEventListener('click',()=> {
+    if (typeof window.artalkItem !== 'object') return
+    let isDark = document.documentElement.getAttribute('data-theme') === 'dark'
+    window.artalkItem.setDarkMode(!isDark)
+  })
 
-    const artalkChangeMode = theme => {
-      const artalkWrap = document.getElementById('artalk-wrap')
-      if (!(artalkWrap && artalkWrap.children.length)) return
-      const isDark = theme === 'dark'
-      window.artalkItem.setDarkMode(isDark)
-    }
   
-
+  if ('!{theme.comments.use[0]}' === 'Artalk' || !!{theme.comments.lazyload}) {
-    btf.addGlobalFn('themeChange', artalkChangeMode, 'artalk')
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
-    
+    else loadArtalk()
-    if ('!{use[0]}' === 'Artalk' || !!{lazyload}) {
+  } else {
-      if (!{lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
+    function loadOtherComment () {
-      else loadArtalk()
+      loadArtalk()
-    } else {
-      window.loadOtherComment = loadArtalk
     }
-  })()
+  }

layout/includes/third-party/comments/disqus.pug

@@ -1,59 +1,51 @@
-- const disqusPageTitle = page.title.replace(/'/ig,"\\'")
+- let disqusPageTitle = page.title.replace(/'/ig,"\\'")
-- const { shortname, apikey } = theme.disqus
-- const { use, lazyload, count } = theme.comments
 
 script.
-  (() => {
+  function loadDisqus () {
-    const disqus_config = function () {
+    var disqus_config = function () {
       this.page.url = '!{ page.permalink }'
       this.page.identifier = '!{ url_for(page.path) }'
       this.page.title = '!{ disqusPageTitle }'
-    }
+    };
 
-    const disqusReset = () => {
+    window.disqusReset = () => {
-      window.DISQUS && window.DISQUS.reset({
+      DISQUS.reset({
         reload: true,
         config: disqus_config
       })
     }
 
-    btf.addGlobalFn('themeChange', disqusReset, 'disqus')
+    if (window.DISQUS) disqusReset()
-
+    else {
-    const loadDisqus = () =>{
+      (function() { 
-      if (window.DISQUS) disqusReset()
+        var d = document, s = d.createElement('script');
-      else {
+        s.src = 'https://!{theme.disqus.shortname}.disqus.com/embed.js';
-        const script = document.createElement('script')
+        s.setAttribute('data-timestamp', +new Date());
-        script.src = 'https://!{shortname}.disqus.com/embed.js'
+        (d.head || d.body).appendChild(s);
-        script.setAttribute('data-timestamp', +new Date())
+      })();
-        document.head.appendChild(script)
-      }
     }
 
-    const getCount = async() => {
+    document.getElementById('darkmode').addEventListener('click', () => {
-      try {
+      setTimeout(() => window.disqusReset(), 200)
-        const eleGroup = document.querySelector('#post-meta .disqus-comment-count')
+    })
-        if (!eleGroup) return
+  }
-        const cleanedLinks = eleGroup.href.replace(/#post-comment$/, '')
 
-        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{shortname}&api_key=!{apikey}&thread:link=${cleanedLinks}`,{
+  if ('!{theme.comments.use[0]}' === 'Disqus' || !!{theme.comments.lazyload}) {
-          method: 'GET'
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqus)
-        })
+    else loadDisqus()
-        const result = await res.json()
+  } else {
-
+    function loadOtherComment () {
-        const count = result.response.length ? result.response[0].posts : 0
+      loadDisqus()
-        eleGroup.textContent = count
-      } catch (err) {
-        console.error(err)
-      }
     }
+  }
 
-    if ('!{use[0]}' === 'Disqus' || !!{lazyload}) {
+if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqus'
-      if (!{lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqus)
+  script.
-      else {
+    if (window.DISQUSWIDGETS === undefined) {
-        loadDisqus()
+      var d = document, s = d.createElement('script');
-        !{ count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : '' }
+      s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
-      }
+      s.id = 'dsq-count-scr';
+      (d.head || d.body).appendChild(s);
     } else {
-      window.loadOtherComment = loadDisqus
+      DISQUSWIDGETS.getCount({reset: true});
     }
-  })()

layout/includes/third-party/comments/disqusjs.pug

@@ -1,19 +1,18 @@
 - let disqusjsPageTitle = page.title.replace(/'/ig,"\\'")
-- const { shortname:dqShortname, apikey:dqApikey, option:dqOption } = theme.disqusjs
 
 script.
-  (() => {
+  function loadDisqusjs () {
-    const initDisqusjs = () => {
+    function initDisqusjs () {
       window.disqusjs = null
       disqusjs = new DisqusJS(Object.assign({
-        shortname: '!{dqShortname}',
+        shortname: '!{theme.disqusjs.shortname}',
         identifier: '!{ url_for(page.path) }',
         url: '!{ page.permalink }',
         title: '!{ disqusjsPageTitle }',
-        apikey: '!{dqApikey}',
+        apikey: '!{theme.disqusjs.apikey}',
-      },!{JSON.stringify(dqOption)}))
+      },!{JSON.stringify(theme.disqusjs.option)}))
 
-      disqusjs.render(document.getElementById('disqusjs-wrap'))
+      disqusjs.render(document.getElementById('disqusjs'))
     }
 
     const themeChange = () => {
@@ -23,42 +22,36 @@ script.
       initDisqusjs()
     }
 
-    btf.addGlobalFn('themeChange', themeChange, 'disqusjs')
 
-    const loadDisqusjs = async() => {
+    document.getElementById('darkmode').addEventListener('click', themeChange)
-      if (window.disqusJsLoad) initDisqusjs()
+
-      else {
+    if (window.disqusJsLoad) initDisqusjs()
-        await getCSS('!{url_for(theme.asset.disqusjs_css)}')
+    else {
-        await getScript('!{url_for(theme.asset.disqusjs)}')
+      getCSS('!{url_for(theme.asset.disqusjs_css)}')
-        initDisqusjs()
+      getScript('!{url_for(theme.asset.disqusjs)}').then(initDisqusjs)
-        window.disqusJsLoad = true
+      window.disqusJsLoad = true
-      }
     }
+  }
 
-    const getCount = async() => {
+  if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-      try {
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs'), loadDisqusjs)
-        const eleGroup = document.querySelector('#post-meta .disqusjs-comment-count')
+    else loadDisqusjs()
-        if (!eleGroup) return
+  }
-        const cleanedLinks = eleGroup.href.replace(/#post-comment$/, '')
+  else {
-
+    function loadOtherComment () {
-        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{dqShortname}&api_key=!{dqApikey}&thread:link=${cleanedLinks}`,{
+      loadDisqusjs()
-          method: 'GET'
-        })
-        const result = await res.json()
-        const count = result.response.length ? result.response[0].posts : 0
-        eleGroup.textContent = count
-      } catch (err) {
-        console.error(err)
-      }
     }
+  }
 
-    if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
+
-      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs-wrap'), loadDisqusjs)
+if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqusjs'
-      else {
+  script.
-        loadDisqusjs()
+    if (window.DISQUSWIDGETS === undefined) {
-        !{ theme.comments.count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : '' }
+      var d = document, s = d.createElement('script');
-      }
+      s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
+      s.id = 'dsq-count-scr';
+      (d.head || d.body).appendChild(s);
     } else {
-      window.loadOtherComment = loadDisqusjs
+      DISQUSWIDGETS.getCount({reset: true});
     }
-  })()
+

layout/includes/third-party/comments/facebook_comments.pug

@@ -2,45 +2,35 @@
 - const fbSDK = theme.messenger.enable ? `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk/xfbml.customerchat.js#xfbml=1&version=${fbSDKVer}` : `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
 
 script.
-  (()=>{
+  function loadFBComment () {
-    const loadFBComment = () => {
+    document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
-      document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
 
-      const themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
+    const themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
-      const $fbComment = document.getElementsByClassName('fb-comments')[0]
+    const $fbComment = document.getElementsByClassName('fb-comments')[0]
-      $fbComment.setAttribute('data-colorscheme',themeNow)
+    $fbComment.setAttribute('data-colorscheme',themeNow)
-      $fbComment.setAttribute('data-href', '!{urlNoIndex(page.permalink)}')
+    $fbComment.setAttribute('data-href', '!{urlNoIndex(page.permalink)}')
 
-      if (typeof FB === 'object') {
+    if (typeof FB === 'object') {
-        FB.XFBML.parse(document.getElementsByClassName('post-meta-commentcount')[0])
+      FB.XFBML.parse(document.getElementsByClassName('post-meta-commentcount')[0])
-        FB.XFBML.parse(document.getElementById('post-comment'))
+      FB.XFBML.parse(document.getElementById('post-comment'))
-      }
-      else {
-        let ele = document.createElement('script')
-        ele.setAttribute('src','!{fbSDK}')
-        ele.setAttribute('async', 'true')
-        ele.setAttribute('defer', 'true')
-        ele.setAttribute('crossorigin', 'anonymous')
-        ele.setAttribute('id', 'facebook-jssdk')
-        document.getElementById('fb-root').insertAdjacentElement('afterbegin',ele)
-      }
     }
+    else {
+      let ele = document.createElement('script')
+      ele.setAttribute('src','!{fbSDK}')
+      ele.setAttribute('async', 'true')
+      ele.setAttribute('defer', 'true')
+      ele.setAttribute('crossorigin', 'anonymous')
+      ele.setAttribute('id', 'facebook-jssdk')
+      document.getElementById('fb-root').insertAdjacentElement('afterbegin',ele)
+    }   
+  }
 
-    const fbModeChange = theme => {
+  if ('!{theme.comments.use[0]}' === 'Facebook Comments' || !!{theme.comments.lazyload}) {
-      const $fbComment = document.getElementsByClassName('fb-comments')[0]
+    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#post-comment .fb-comments'), loadFBComment)
-      if ($fbComment && typeof FB === 'object') {
+    else loadFBComment()
-        $fbComment.setAttribute('data-colorscheme',theme)
+  } else {
-        FB.XFBML.parse(document.getElementById('post-comment'))
+    function loadOtherComment () {
-      }
+      loadFBComment()
     }
-
+  }
-    btf.addGlobalFn('themeChange', fbModeChange, 'facebook_comments')
-
-    if ('!{theme.comments.use[0]}' === 'Facebook Comments' || !!{theme.comments.lazyload}) {
-      if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#post-comment .fb-comments'), loadFBComment)
-      else loadFBComment()
-    } else {
-      window.loadOtherComment = loadFBComment
-    }
-  })()
 

layout/includes/third-party/comments/giscus.pug

@@ -1,54 +1,51 @@
 - const { repo, repo_id, category_id, theme:themes, option } = theme.giscus
 - const giscusUrl = theme.asset.giscus || 'https://giscus.app/client.js'
 - const giscusOriginUrl = new URL(giscusUrl).origin
-- const { use, lazyload } = theme.comments
 
 script.
-  (()=>{
+  function getGiscusTheme () {
-    const getGiscusTheme = theme => {
+    return document.documentElement.getAttribute('data-theme') === 'dark' ? '!{themes.dark}' : '!{themes.light}'
-      return theme === 'dark' ? '!{themes.dark}' : '!{themes.light}'
+  }
+
+  function loadGiscus () {
+    const config = Object.assign({
+      src: '!{giscusUrl}',
+      'data-repo': '!{repo}',
+      'data-repo-id': '!{repo_id}',
+      'data-category-id': '!{category_id}',
+      'data-mapping': 'pathname',
+      'data-theme': getGiscusTheme(),
+      'data-reactions-enabled': '1',
+      crossorigin: 'anonymous',
+      async: true
+    },!{JSON.stringify(option)})
+
+    let ele = document.createElement('script')
+    for (let key in config) {
+      ele.setAttribute(key, config[key])
+    }
+    document.getElementById('giscus-wrap').insertAdjacentElement('afterbegin',ele)
+  }
+
+  function changeGiscusTheme () {
+    function sendMessage(message) {
+      const iframe = document.querySelector('iframe.giscus-frame')
+      if (!iframe) return
+      iframe.contentWindow.postMessage({ giscus: message }, '!{giscusOriginUrl}')
     }
 
-    const loadGiscus = () => {
+    sendMessage({
-      const config = Object.assign({
+      setConfig: {
-        src: '!{giscusUrl}',
+        theme: getGiscusTheme()
-        'data-repo': '!{repo}',
-        'data-repo-id': '!{repo_id}',
-        'data-category-id': '!{category_id}',
-        'data-mapping': 'pathname',
-        'data-theme': getGiscusTheme(document.documentElement.getAttribute('data-theme')),
-        'data-reactions-enabled': '1',
-        crossorigin: 'anonymous',
-        async: true
-      },!{JSON.stringify(option)})
-
-      const ele = document.createElement('script')
-      for (let key in config) {
-        ele.setAttribute(key, config[key])
       }
-      document.getElementById('giscus-wrap').appendChild(ele)
+    });
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Giscus' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('giscus-wrap'), loadGiscus)
+    else loadGiscus()
+  } else {
+    function loadOtherComment () {
+      loadGiscus()
     }
-
+  }
-    const changeGiscusTheme = theme => {
-      const sendMessage = message => {
-        const iframe = document.querySelector('iframe.giscus-frame')
-        if (!iframe) return
-        iframe.contentWindow.postMessage({ giscus: message }, '!{giscusOriginUrl}')
-      }
-
-      sendMessage({
-        setConfig: {
-          theme: getGiscusTheme(theme)
-        }
-      });
-    }
-
-    btf.addGlobalFn('themeChange', changeGiscusTheme, 'giscus')
-
-    if ('!{use[0]}' === 'Giscus' || !!{lazyload}) {
-      if (!{lazyload}) btf.loadComment(document.getElementById('giscus-wrap'), loadGiscus)
-      else loadGiscus()
-    } else {
-      window.loadOtherComment= loadGiscus
-    }
-  })()

layout/includes/third-party/comments/gitalk.pug

@@ -1,44 +1,41 @@
-- const { client_id, client_secret, repo, owner, admin, option } = theme.gitalk
-
 script.
-  (() => {
+  function loadGitalk () {
-    const initGitalk = () => {
+    function initGitalk () {
-      const gitalk = new Gitalk(Object.assign({
+      var gitalk = new Gitalk(Object.assign({
-        clientID: '!{client_id}',
+        clientID: '!{theme.gitalk.client_id}',
-        clientSecret: '!{client_secret}',
+        clientSecret: '!{theme.gitalk.client_secret}',
-        repo: '!{repo}',
+        repo: '!{theme.gitalk.repo}',
-        owner: '!{owner}',
+        owner: '!{theme.gitalk.owner}',
-        admin: ['!{admin}'],
+        admin: ['!{theme.gitalk.admin}'],
         id: '!{md5(page.path)}',
         updateCountCallback: commentCount
-      },!{JSON.stringify(option)}))
+      },!{JSON.stringify(theme.gitalk.option)}))
 
       gitalk.render('gitalk-container')
     }
 
-    const loadGitalk = async() => {
+    if (typeof Gitalk === 'function') initGitalk()
-      if (typeof Gitalk === 'function') initGitalk()
+    else {
-      else {
+      getCSS('!{url_for(theme.asset.gitalk_css)}')
-        await getCSS('!{url_for(theme.asset.gitalk_css)}')
+      getScript('!{url_for(theme.asset.gitalk)}').then(initGitalk)
-        await getScript('!{url_for(theme.asset.gitalk)}')
-        initGitalk()
-      }
     }
-    
+  }
-    const commentCount = n => {
+  
-      const isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
+  function commentCount(n){
-      if (isCommentCount) {
+    let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
-        isCommentCount.textContent= n
+    if (isCommentCount) {
-      }
+      isCommentCount.innerHTML= n
     }
+  }
 
-    if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
+  if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
-      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
-      else loadGitalk()
+    else loadGitalk()
-    } else {
+  } else {
-      window.loadOtherComment = loadGitalk
+    function loadOtherComment () {
+      loadGitalk()
     }
-  })()
+  }
 
 
 

layout/includes/third-party/comments/index.pug

@@ -1,5 +1,5 @@
 - let defaultComment = theme.comments.use[0]
-hr.custom-hr
+hr
 #post-comment
   .comment-head
     .comment-headline
@@ -7,9 +7,9 @@ hr.custom-hr
       span= ' ' + _p('comment')
     
     if theme.comments.use.length > 1
-      .comment-switch
+      #comment-switch
         span.first-comment=defaultComment
-        span#switch-btn
+        span.switch-btn
         span.second-comment=theme.comments.use[1]
 
 
@@ -22,7 +22,7 @@ hr.custom-hr
           when 'Valine'
             #vcomment.vcomment
           when 'Disqusjs'
-            #disqusjs-wrap
+            #disqusjs
           when 'Livere'
             #lv-container(data-id="city" data-uid=theme.livere.uid)
           when 'Gitalk'

layout/includes/third-party/comments/livere.pug

@@ -1,25 +1,26 @@
-- const { use, lazyload } = theme.comments
-
 script.
-  (()=>{
+  function loadLivere () {
-    const loadLivere = () => {
+    if (typeof LivereTower === 'object') {
-      if (typeof LivereTower === 'object') window.LivereTower.init()
+      window.LivereTower.init()
-      else {
-        (function(d, s) {
-            var j, e = d.getElementsByTagName(s)[0];
-            if (typeof LivereTower === 'function') { return; }
-            j = d.createElement(s);
-            j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
-            j.async = true;
-            e.parentNode.insertBefore(j, e);
-        })(document, 'script');
-      }
     }
+    else {
+      (function(d, s) {
+          var j, e = d.getElementsByTagName(s)[0];
+          if (typeof LivereTower === 'function') { return; }
+          j = d.createElement(s);
+          j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
+          j.async = true;
+          e.parentNode.insertBefore(j, e);
+      })(document, 'script');
+    }
+  }
 
-    if ('!{use[0]}' === 'Livere' || !!{lazyload}) {
+  if ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) {
-      if (!{lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
-      else loadLivere()
+    else loadLivere()
-    } else {
+  }
-      window.loadOtherComment = loadLivere
+  else {
+    function loadOtherComment () {
+      loadLivere()
     }
-  })()
+  }

layout/includes/third-party/comments/remark42.pug

@@ -51,12 +51,11 @@ script.
     }
   }
 
-  function remarkChangeMode (theme) {
+  document.getElementById('darkmode').addEventListener('click',()=>{
     if (!window.REMARK42) return
+    let theme = document.documentElement.getAttribute('data-theme') === 'dark' ? 'light' : 'dark'
     window.REMARK42.changeTheme(theme)
-  }
+  })
-
-  btf.addGlobalFn('themeChange', remarkChangeMode, 'remark42')
 
   if ('!{theme.comments.use[0]}' === 'Remark42' || !!{theme.comments.lazyload}) {
     if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('remark42'), loadRemark42)

layout/includes/third-party/comments/twikoo.pug

@@ -2,23 +2,18 @@
 - const { use, lazyload, count } = theme.comments
 
 script.
-  (() => {
+  (()=>{
     const init = () => {
       twikoo.init(Object.assign({
         el: '#twikoo-wrap',
         envId: '!{envId}',
         region: '!{region}',
-        onCommentLoaded: () => {
+        onCommentLoaded: function () {
           btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
         }
       }, !{JSON.stringify(option)}))
     }
 
-    const loadTwikoo = () => {
-      if (typeof twikoo === 'object') setTimeout(init,0)
-      else getScript('!{url_for(theme.asset.twikoo)}').then(init)
-    }
-
     const getCount = () => {
       const countELement = document.getElementById('twikoo-count')
       if(!countELement) return
@@ -27,20 +22,32 @@ script.
         region: '!{region}',
         urls: [window.location.pathname],
         includeReply: false
-      }).then(res => {
+      }).then(function (res) {
-        countELement.textContent = res[0].count
+        countELement.innerText = res[0].count
-      }).catch(err => {
+      }).catch(function (err) {
-        console.error(err)
+        console.error(err);
-      })
+      });
+    }
+
+    const runFn = () => {
+      init()
+      !{count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : ''}
+    }
+
+    const loadTwikoo = () => {
+      if (typeof twikoo === 'object') {
+        setTimeout(runFn,0)
+        return
+      } 
+      getScript('!{url_for(theme.asset.twikoo)}').then(runFn)
     }
 
     if ('!{use[0]}' === 'Twikoo' || !!{lazyload}) {
       if (!{lazyload}) btf.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
-      else {
+      else loadTwikoo()
-        loadTwikoo()
-        !{count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : ''}
-      }
     } else {
-      window.loadOtherComment = loadTwikoo
+      window.loadOtherComment = () => {
+        loadTwikoo()
+      }
     }
   })()

layout/includes/third-party/comments/utterances.pug

@@ -1,39 +1,34 @@
-- const { use, lazyload } = theme.comments
-- const { repo, issue_term, light_theme, dark_theme } = theme.utterances
-
 script.
-  (() => {
+  function loadUtterances () {
-    const loadUtterances = () => {
+    let ele = document.createElement('script')
-      let ele = document.createElement('script')
+    ele.setAttribute('id', 'utterances_comment')
-      ele.id = 'utterances_comment'
+    ele.setAttribute('src', 'https://utteranc.es/client.js')
-      ele.src = 'https://utteranc.es/client.js'
+    ele.setAttribute('repo', '!{theme.utterances.repo}')
-      ele.setAttribute('repo', '!{repo}')
+    ele.setAttribute('issue-term', '!{theme.utterances.issue_term}')
-      ele.setAttribute('issue-term', '!{issue_term}')
+    let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
-      const nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{dark_theme}' : '#{light_theme}'
+    ele.setAttribute('theme', nowTheme)
-      ele.setAttribute('theme', nowTheme)
+    ele.setAttribute('crossorigin', 'anonymous')
-      ele.crossOrigin = 'anonymous'
+    ele.setAttribute('async', 'true')
-      ele.async = true
+    document.getElementById('utterances-wrap').insertAdjacentElement('afterbegin',ele)
-      document.getElementById('utterances-wrap').appendChild(ele)
+  }
-    }
 
-    const utterancesTheme = theme => {
+  function utterancesTheme () {
-      const iframe = document.querySelector('.utterances-frame')
+    const iframe = document.querySelector('.utterances-frame')
-      if (iframe) {
+    if (iframe) {
-        const theme = theme === 'dark' ? '#{dark_theme}' : '#{light_theme}'
+      const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
-        const message = {
+      const message = {
-          type: 'set-theme',
+        type: 'set-theme',
-          theme: theme
+        theme: theme
-        };
+      };
-        iframe.contentWindow.postMessage(message, 'https://utteranc.es');
+      iframe.contentWindow.postMessage(message, 'https://utteranc.es');
-      }
     }
+  }
 
-    btf.addGlobalFn('themeChange', utterancesTheme, 'utterances')
+  if ('!{theme.comments.use[0]}' === 'Utterances' || !!{theme.comments.lazyload}) {
-
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('utterances-wrap'), loadUtterances)
-    if ('!{use[0]}' === 'Utterances' || !!{lazyload}) {
+    else loadUtterances()
-      if (!{lazyload}) btf.loadComment(document.getElementById('utterances-wrap'), loadUtterances)
+  } else {
-      else loadUtterances()
+    function loadOtherComment () {
-    } else {
+      loadUtterances()
-      window.loadOtherComment = loadUtterances
     }
-  })()
+  }

layout/includes/third-party/comments/valine.pug

@@ -1,38 +1,33 @@
-- const { use, lazyload } = theme.comments
-- const { appId, appKey, avatar, serverURLs, visitor, option } = theme.valine
-
 - let emojiMaps = '""'
 if site.data.valine
   - emojiMaps = JSON.stringify(site.data.valine)
 
 script.
-  (() => {
+  function loadValine () {
-    const initValine = () => {
+    function initValine () {
       const valine = new Valine(Object.assign({
         el: '#vcomment',
-        appId: '#{appId}',
+        appId: '#{theme.valine.appId}',
-        appKey: '#{appKey}',
+        appKey: '#{theme.valine.appKey}',
-        avatar: '#{avatar}',
+        avatar: '#{theme.valine.avatar}',
-        serverURLs: '#{serverURLs}',
+        serverURLs: '#{theme.valine.serverURLs}',
         emojiMaps: !{emojiMaps},
         path: window.location.pathname,
-        visitor: #{visitor}
+        visitor: #{theme.valine.visitor}
-      }, !{JSON.stringify(option)}))
+      }, !{JSON.stringify(theme.valine.option)}))
     }
 
-    const loadValine = async () => {
+    if (typeof Valine === 'function') initValine() 
-      if (typeof Valine === 'function') initValine()
+    else getScript('!{url_for(theme.asset.valine)}').then(initValine)
-      else {
+  }
-        await getScript('!{url_for(theme.asset.valine)}')
-        initValine()
-      }
-    }
 
-    if ('!{use[0]}' === 'Valine' || !!{lazyload}) {
+  if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
-      if (!{lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
-      else setTimeout(loadValine, 0)
+    else setTimeout(loadValine, 0)
-    } else {
+  } else {
-      window.loadOtherComment = loadValine
+    function loadOtherComment () {
+      loadValine()
     }
-  })()
+  }
+  
 

layout/includes/third-party/comments/waline.pug

@@ -2,8 +2,8 @@
 - const { lazyload, count, use } = theme.comments
 
 script.
-  (() => {
+  function loadWaline () {
-    const initWaline = () => {
+    function initWaline () {
       const waline = Waline.init(Object.assign({
         el: '#waline-wrap',
         serverURL: '!{serverURL}',
@@ -14,20 +14,25 @@ script.
       }, !{JSON.stringify(option)}))
     }
 
-    const loadWaline = async () => {
+    const walineCSSLoad = document.getElementById('waline-css')
-      if (typeof Waline === 'object') initWaline()
-      else {
-        await getCSS('!{url_for(theme.asset.waline_css)}')
-        await getScript('!{url_for(theme.asset.waline_js)}')
-        initWaline()
-      }
-    }
 
-    if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
+    if (typeof Waline === 'object') {
-      if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+      walineCSSLoad ? initWaline() : getCSS('!{url_for(theme.asset.waline_css)}','waline-css').then(initWaline)
-      else setTimeout(loadWaline, 0)
-    } else {
-      window.loadOtherComment = loadWaline
     }
-  })()
+    else {
+      getCSS('!{url_for(theme.asset.waline_css)}','waline-css').then(() => {
+        getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
+      })
+    }
+  }
+
+  if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
+    if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+    else setTimeout(loadWaline, 0)
+  } else {
+    function loadOtherComment () {
+      loadWaline()
+    }
+  }
+  
 

layout/includes/third-party/effect.pug

@@ -24,12 +24,12 @@ if theme.activate_power_mode.enable
 if theme.click_heart && theme.click_heart.enable
   script#click-heart(src=url_for(theme.asset.click_heart) async mobile=`${theme.click_heart.mobile}`)
 
-if theme.clickShowText && theme.clickShowText.enable
+if theme.ClickShowText && theme.ClickShowText.enable
   script#click-show-text(
-    src= url_for(theme.asset.clickShowText)
+    src= url_for(theme.asset.ClickShowText)
-    data-mobile= `${theme.clickShowText.mobile}`
+    data-mobile= `${theme.ClickShowText.mobile}`
-    data-text= theme.clickShowText.text.join(",")
+    data-text= theme.ClickShowText.text.join(",")
-    data-fontsize= theme.clickShowText.fontSize
+    data-fontsize= theme.ClickShowText.fontSize
-    data-random= `${theme.clickShowText.random}`
+    data-random= `${theme.ClickShowText.random}`
     async
   )

layout/includes/third-party/math/mathjax.pug

@@ -3,7 +3,7 @@ script.
   if (!window.MathJax) {
     window.MathJax = {
       tex: {
-        inlineMath: [['$', '$'], ['\\(', '\\)']],
+        inlineMath: [ ['$','$'], ["\\(","\\)"]],
         tags: 'ams'
       },
       chtml: {
@@ -21,7 +21,16 @@ script.
               math.end = {node: text, delim: '', n: 0}
               doc.math.push(math)
             }
-          }, '']
+          }, ''],
+          insertScript: [200, () => {
+            document.querySelectorAll('mjx-container').forEach(node => {
+              if (node.hasAttribute('display')) {
+                btf.wrap(node, 'div', { class: 'mathjax-overflow' })
+              } else {
+                btf.wrap(node, 'span', { class: 'mathjax-overflow' })
+              }
+            });
+          }, '', false]
         }
       }
     }

layout/includes/third-party/math/mermaid.pug

@@ -1,38 +1,26 @@
 script.
   (() => {
-    const $mermaid = document.querySelectorAll('#article-container .mermaid-wrap')
+    const $mermaidWrap = document.querySelectorAll('#article-container .mermaid-wrap')
-    if ($mermaid.length === 0) return
+    if ($mermaidWrap.length) {
-    const runMermaid = () => {
+      window.runMermaid = () => {
-      window.loadMermaid = true
+        window.loadMermaid = true
-      const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
+        const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
 
-      Array.from($mermaid).forEach((item, index) => {
+        Array.from($mermaidWrap).forEach((item, index) => {
-        const mermaidSrc = item.firstElementChild
+          const mermaidSrc = item.firstElementChild
-        const mermaidThemeConfig = '%%{init:{ \'theme\':\'' + theme + '\'}}%%\n'
+          const mermaidThemeConfig = '%%{init:{ \'theme\':\'' + theme + '\'}}%%\n'
-        const mermaidID = 'mermaid-' + index
+          const mermaidID = 'mermaid-' + index
-        const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent
+          const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent
-
+          mermaid.mermaidAPI.render(mermaidID, mermaidDefinition, (svgCode) => {
-        const renderFn = mermaid.render(mermaidID, mermaidDefinition)
+            mermaidSrc.insertAdjacentHTML('afterend', svgCode)
-
-        const renderV10 = () => {
-          renderFn.then(({svg}) => {
-            mermaidSrc.insertAdjacentHTML('afterend', svg)
           })
-        }
+        })
+      }
 
-        const renderV9 = svg => {
+      const loadMermaid = () => {
-          mermaidSrc.insertAdjacentHTML('afterend', svg)
+        window.loadMermaid ? runMermaid() : getScript('!{url_for(theme.asset.mermaid)}').then(runMermaid)
-        }
+      }
 
-        typeof renderFn === 'string' ? renderV9(renderFn) : renderV10()
+      window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)
-      })
     }
-
-    const loadMermaid = () => {
-      window.loadMermaid ? runMermaid() : getScript('!{url_for(theme.asset.mermaid)}').then(runMermaid)
-    }
-
-    btf.addGlobalFn('themeChange', runMermaid, 'mermaid')
-
-    window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)
   })()

layout/includes/third-party/newest-comments/artalk.pug

@@ -1,6 +1,6 @@
 - const { server, site, option } = theme.artalk
-- const avatarCdn = option !== null && option.gravatar && option.gravatar.mirror
+- const avatarCdn = option !== null && option.gravatar ? option.gravatar.mirror : 'https://sdn.geekzu.org/avatar/'
-- const avatarDefault = option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)
+- const avatarDefault = option !== null && option.gravatar ? option.gravatar.default : 'mp'
 
 script.
   window.addEventListener('load', () => {
@@ -45,53 +45,32 @@ script.
       window.pjax && window.pjax.refresh($dom)
     }
 
-    const getSetting = async () => {
-      try {
-        const res = await fetch('!{server}/api/conf', { method: 'GET' })
-        return await res.json()
-      } catch (e) {
-        console.log(e)
-      }
-    }
-
     const headerList = {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
         'Origin': window.location.origin
-      },
+      }
-      body: new URLSearchParams({
-        'site_name': '!{site}',
-        'limit': '!{theme.newest_comments.limit}',
-        'type':'latest_comments'
-      })
     }
 
-    const getComment = async () => {
+    const getComment = () => {
-      try {
+      fetch('!{server}/api/stat?type=latest_comments&limit=!{theme.newest_comments.limit}&site_name=!{site}', headerList)
-        const res = await fetch('!{server}/api/stat', headerList)
+        .then(response => response.json())
-        const result = await res.json()
+        .then(d => {
-        const avatarStr = await getSetting()
+          const artalk = d.data.map(function (e) {
-        const { mirror, params, default:defaults } = avatarStr.data.frontend_conf.gravatar
+            return {
-        const avatarCdn = !{avatarCdn} || mirror
+              'avatar': '!{avatarCdn}' + e.email_encrypted + '?d=!{avatarDefault}',
-        let avatarDefault = !{avatarDefault} || params || defaults
+              'content': changeContent(e.content_marked),
-        avatarDefault = avatarDefault.startsWith('d=') ? avatarDefault : `d=${avatarDefault}`
+              'nick': e.nick,
-        const artalk = result.data.map(function (e) {
+              'url': e.page_url,
-          return {
+              'date': e.date,
-            'avatar': `${avatarCdn}${e.email_encrypted}?${avatarDefault}`,
+            }
-            'content': changeContent(e.content_marked),
+          })
-            'nick': e.nick,
+          saveToLocal.set('artalk-newest-comments', JSON.stringify(artalk), !{theme.newest_comments.storage}/(60*24))
-            'url': e.page_url,
+          generateHtml(artalk)
-            'date': e.date,
+        }).catch(e => {
-          }
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
-        saveToLocal.set('artalk-newest-comments', JSON.stringify(artalk), !{theme.newest_comments.storage}/(60*24))
-        generateHtml(artalk)
-      } catch (e) {
-        console.log(e)
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-      }
     }
 
     const newestCommentInit = () => {

layout/includes/third-party/newest-comments/disqus-comment.pug

@@ -32,7 +32,7 @@ script.
           generateHtml(disqusArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 

layout/includes/third-party/newest-comments/github-issues.pug

@@ -58,7 +58,7 @@ script.
           findTrueUrl(githubArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 

layout/includes/third-party/newest-comments/remark42.pug

@@ -60,7 +60,7 @@ script.
           generateHtml(remark42)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 

layout/includes/third-party/newest-comments/twikoo-comment.pug

@@ -36,7 +36,7 @@ script.
           generateHtml(twikooArray)
         }).catch(function (err) {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
       }
 

layout/includes/third-party/newest-comments/valine.pug

@@ -79,7 +79,7 @@ script.
           generateHtml(valineArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         }) 
     }
 

layout/includes/third-party/newest-comments/waline.pug

@@ -1,8 +1,6 @@
-- const serverURL = theme.waline.serverURL.replace(/\/$/, '')
-
 script.
   window.addEventListener('load', () => {
-    const changeContent = content => {
+    const changeContent = (content) => {
       if (content === '') return content
 
       content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
@@ -43,26 +41,31 @@ script.
       window.pjax && window.pjax.refresh($dom)
     }
 
-    const getComment = async () => {
+    const getComment = () => {
-      try {
+      const loadWaline = () => {
-        const res = await fetch('!{serverURL}/api/comment?type=recent&count=!{theme.newest_comments.limit}', { method: 'GET' })
+        Waline.RecentComments({
-        const result = await res.json()
+          serverURL: '!{theme.waline.serverURL}',
-        const walineArray = result.data.map(e => {
+          count: !{theme.newest_comments.limit}
-          return {
+        }).then(({comments}) => {
-            'content': changeContent(e.comment),
+          const walineArray = comments.map(e => {
-            'avatar': e.avatar,
+            return {
-            'nick': e.nick,
+              'content': changeContent(e.comment),
-            'url': e.url + '#' + e.objectId,
+              'avatar': e.avatar,
-            'date': e.time || e.insertedAt
+              'nick': e.nick,
-          }
+              'url': e.url + '#' + e.objectId,
-        })
+              'date': e.insertedAt,
-        saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
+            }
-        generateHtml(walineArray)
+          })
-      } catch (err) {
+          saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
-        console.error(err)
+          generateHtml(walineArray)
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
+        }).catch(e => {
-        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        }) 
       }
+
+      if (typeof Waline === 'object') loadWaline()
+      else getScript('!{url_for(theme.asset.waline_js)}').then(loadWaline)
     }
 
     const newestCommentInit = () => {

layout/includes/third-party/pjax.pug

@@ -26,11 +26,11 @@ script.
 
   document.addEventListener('pjax:send', function () {
 
-    // removeEventListener
+    // removeEventListener scroll 
-    btf.removeGlobalFnEvent('pjax')
+    window.tocScrollFn && window.removeEventListener('scroll', window.tocScrollFn)
-    btf.removeGlobalFnEvent('themeChange')
+    window.scrollCollect && window.removeEventListener('scroll', scrollCollect)
 
-    document.getElementById('rightside').classList.remove('rightside-show')
+    document.getElementById('rightside').style.cssText = "opacity: ''; transform: ''"
     
     if (window.aplayers) {
       for (let i = 0; i < window.aplayers.length; i++) {
@@ -62,6 +62,7 @@ script.
 
     GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
 
+    typeof chatBtnFn === 'function' && chatBtnFn()
     typeof panguInit === 'function' && panguInit()
 
     // google analytics
@@ -76,8 +77,8 @@ script.
     typeof Prism === 'object' && Prism.highlightAll()
   })
 
-  document.addEventListener('pjax:error', e => {
+  document.addEventListener('pjax:error', (e) => {
     if (e.request.status === 404) {
-      pjax.loadUrl('!{url_for("/404.html")}')
+      pjax.loadUrl('/404.html')
     }
   })

layout/includes/third-party/search/docsearch.pug

@@ -13,12 +13,11 @@
         container: '#docsearch',
       }, !{JSON.stringify(option)}))
 
-      const handleClick = () => {
-        document.querySelector('.DocSearch-Button').click()
-      }
 
       const searchClickFn = () => {
-        btf.addEventListenerPjax(document.querySelector('#search-button > .search'), 'click', handleClick)
+        document.querySelector('#search-button > .search').addEventListener('click', () => {
+          document.querySelector('.DocSearch-Button').click()
+        })
       }
 
       searchClickFn()

layout/includes/third-party/search/local-search.pug

@@ -15,7 +15,7 @@
         .local-search-box
           input(placeholder=_p("search.local_search.input_placeholder") type="text").local-search-box--input
       hr
-      #local-search-results
+      #local-search-results.no-result
       #local-search-stats-wrap
   #search-mask
 

layout/includes/third-party/share/add-this.pug

@@ -0,0 +1,2 @@
+.addthis_inline_share_toolbox
+script(src=`//s7.addthis.com/js/300/addthis_widget.js#pubid=${theme.addThis.pubid}` async)

layout/includes/third-party/share/index.pug

@@ -1,5 +1,7 @@
 .post_share
-  if theme.sharejs.enable
+  if theme.addThis.enable
+    !=partial('includes/third-party/share/add-this', {}, {cache: true})
+  else if theme.sharejs.enable
     include ./share-js.pug
   else if theme.addtoany.enable
     !=partial('includes/third-party/share/addtoany', {}, {cache: true})

layout/includes/third-party/subtitle.pug

@@ -38,7 +38,7 @@ case source
               sub.unshift(data.hitokoto, from)
               typedJSFn.init(sub)
             } else {
-              document.getElementById('subtitle').textContent = data.hitokoto
+              document.getElementById('subtitle').innerHTML = data.hitokoto
             }
           })
       }
@@ -55,7 +55,7 @@ case source
             sub.unshift(con, from)
             typedJSFn.init(sub)
           } else {
-            document.getElementById('subtitle').textContent = con
+            document.getElementById('subtitle').innerHTML = con
           }
         })
       }
@@ -72,7 +72,7 @@ case source
               sub.unshift(content)
               typedJSFn.init(sub)
             } else {
-              document.getElementById('subtitle').textContent = result.data.content
+              document.getElementById('subtitle').innerHTML = result.data.content
             }
           })
         })
@@ -86,7 +86,7 @@ case source
         if (!{effect}) {
           typedJSFn.init(!{JSON.stringify(subContent)})
         } else {
-          document.getElementById("subtitle").textContent = !{JSON.stringify(subContent[0])}
+          document.getElementById("subtitle").innerHTML = '!{subContent[0]}'
         }
       }
       typedJSFn.run(subtitleType)

layout/includes/widget/card_author.pug

@@ -24,4 +24,4 @@ if theme.aside.card_author.enable
   
     if(theme.social)
         .card-info-social-icons.is-center
-          !=partial('includes/header/social', {}, {cache: true})
+          !=fragment_cache('social', function(){return partial('includes/header/social')}) 

layout/includes/widget/card_newest_comment.pug

@@ -1,4 +1,4 @@
-if theme.newest_comments.enable && theme.comments.use && !['Livere','Facebook Comments','Giscus'].includes(theme.comments.use[0])
+if theme.newest_comments.enable && !['Livere','Facebook Comments','Giscus'].includes(theme.comments.use[0])
   .card-widget#card-newest-comments
     .item-headline
       i.fas.fa-comment-dots

layout/includes/widget/card_post_series.pug

@@ -1,21 +0,0 @@
-if theme.aside.card_post_series.enable
-  - const array = fragment_cache('seriesArr', groupPosts)
-  .card-widget.card-post-series
-    .item-headline
-      i.fa-solid.fa-layer-group
-      span= _p('aside.card_post_series')
-    .aside-list
-      each item in array[page.series]
-        - const { path, title = _p('no_title'), cover, cover_type, date:dateA } = item
-        - let link = url_for(path)
-        - let no_cover = cover === false || !theme.cover.aside_enable ? 'no-cover' : ''
-        .aside-list-item(class=no_cover)
-          if cover && theme.cover.aside_enable
-            a.thumbnail(href=link title=title)
-              if cover_type === 'img'
-                img(src=url_for(cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-              else
-                div(style=`background: ${cover}`)
-          .content
-            a.title(href=link title=title)= title
-            time(datetime=date_xml(dateA) title=_p('post.created') + ' ' + full_date(dateA)) #[=date(dateA, config.date_format)]

layout/includes/widget/index.pug

@@ -13,8 +13,6 @@
       .sticky_layout
         if showToc
           include ./card_post_toc.pug
-        if page.series
-          include ./card_post_series.pug
         !=partial('includes/widget/card_recent_post', {}, {cache: true})
         !=partial('includes/widget/card_ad', {}, {cache: true})
   else

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "4.10.0",
+  "version": "4.8.0",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -23,7 +23,7 @@
     "email": "my@crazywong.com"
   },
   "dependencies": {
-    "hexo-renderer-stylus": "^3.0.0",
+    "hexo-renderer-stylus": "^2.1.0",
     "hexo-renderer-pug": "^3.0.0"
   },
   "homepage": "https://butterfly.js.org/",

plugins.yml

@@ -1,11 +1,11 @@
 algolia_search:
   name: algoliasearch
   file: dist/algoliasearch-lite.umd.js
-  version: 4.20.0
+  version: 4.17.0
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.57.0
+  version: 4.54.0
 pjax:
   name: pjax
   file: pjax.min.js
@@ -37,17 +37,17 @@ disqusjs_css:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.6.22
+  version: 1.6.14
 waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 2.15.8
+  version: 2.14.9
 waline_css:
   name: '@waline/client'
   file: dist/waline.css
   other_name: waline
-  version: 2.15.8
+  version: 2.14.9
 sharejs:
   name: butterfly-extsrc
   file: sharejs/dist/js/social-share.min.js
@@ -64,16 +64,16 @@ katex:
   name: katex
   file: dist/katex.min.css
   other_name: KaTeX
-  version: 0.16.9
+  version: 0.16.4
 katex_copytex:
   name: katex
   file: dist/contrib/copy-tex.min.js
   other_name: KaTeX
-  version: 0.16.9
+  version: 0.16.4
 mermaid:
   name: mermaid
   file: dist/mermaid.min.js
-  version: 10.5.0
+  version: 9.4.3
 canvas_ribbon:
   name: butterfly-extsrc
   file: dist/canvas-ribbon.min.js
@@ -98,14 +98,14 @@ click_heart:
   name: butterfly-extsrc
   file: dist/click-heart.min.js
   version: 1.1.3
-clickShowText:
+ClickShowText:
   name: butterfly-extsrc
   file: dist/click-show-text.min.js
   version: 1.1.3
 lazyload:
   name: vanilla-lazyload
   file: dist/lazyload.iife.min.js
-  version: 17.8.4
+  version: 17.8.3
 instantpage:
   name: instant.page
   file: instantpage.js
@@ -113,7 +113,7 @@ instantpage:
 typed:
   name: typed.js
   file: dist/typed.umd.js
-  version: 2.0.16
+  version: 2.0.15
 pangu:
   name: pangu
   file: dist/browser/pangu.min.js
@@ -121,12 +121,12 @@ pangu:
 fancybox_css:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.css
-  version: 5.0.24
+  version: 5.0.15
   other_name: fancyapps-ui
 fancybox:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.umd.js
-  version: 5.0.24
+  version: 5.0.15
   other_name: fancyapps-ui
 medium_zoom:
   name: medium-zoom
@@ -144,12 +144,15 @@ fontawesome:
   name: '@fortawesome/fontawesome-free'
   file: css/all.min.css
   other_name: font-awesome
-  version: 6.4.2
+  version: 6.4.0
-egjs_infinitegrid:
+flickr_justified_gallery_js:
-  name: '@egjs/infinitegrid'
+  name: flickr-justified-gallery
-  other_name: egjs-infinitegrid
+  file: dist/fjGallery.min.js
-  file: dist/infinitegrid.min.js
+  version: 2.1.2
-  version: 4.10.1
+flickr_justified_gallery_css:
+  name: flickr-justified-gallery
+  file: dist/fjGallery.css
+  version: 2.1.2
 aplayer_css:
   name: aplayer
   file: dist/APlayer.min.css
@@ -180,11 +183,11 @@ prismjs_autoloader:
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.6.3
+  version: 2.5.4
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.6.3
+  version: 2.5.4
 pace_js:
   name: pace-js
   other_name: pace
@@ -199,13 +202,13 @@ docsearch_js:
   name: '@docsearch/js'
   other_name: docsearch-js
   file: dist/umd/index.js
-  version: 3.5.2
+  version: 3.3.3
 docsearch_css:
   name: '@docsearch/css'
   other_name: docsearch-css
   file: dist/style.css
-  version: 3.5.2
+  version: 3.3.3
 abcjs_basic_js:
   name: abcjs
   file: dist/abcjs-basic-min.js
-  version: 6.2.2
+  version: 6.2.0

scripts/events/cdn.js

@@ -48,11 +48,12 @@ hexo.extend.filter.register('before_generate', () => {
   const createCDNLink = (data, type, cond = '') => {
     Object.keys(data).forEach(key => {
       let { name, version, file, other_name } = data[key]
+
+      const min_file = minFile(file)
       const cdnjs_name = other_name || name
       const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '')
       const min_cdnjs_file = minFile(cdnjs_file)
       if (cond === 'internal') file = `source/${file}`
-      const min_file = minFile(file)
       const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : ''
 
       const value = {

scripts/events/init.js

@@ -1,19 +1,21 @@
 hexo.extend.filter.register('before_generate', () => {
   // Get first two digits of the Hexo version number
-  const { version, log, locals } = hexo
+  const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
-  const hexoVer = version.replace(/(^.*\..*)\..*/, '$1')
+  const logger = hexo.log
 
   if (hexoVer < 5.3) {
-    log.error('Please update Hexo to V5.3.0 or higher!')
+    logger.error('Please update Hexo to V5.3.0 or higher!')
-    log.error('請把 Hexo 升級到 V5.3.0 或更高的版本！')
+    logger.error('請把 Hexo 升級到 V5.3.0 或更高的版本！')
     process.exit(-1)
   }
 
-  if (locals.get) {
+  if (hexo.locals.get) {
-    const data = locals.get('data')
+    const data = hexo.locals.get('data')
     if (data && data.butterfly) {
-      log.error("'butterfly.yml' is deprecated. Please use '_config.butterfly.yml'")
+      logger.error(
-      log.error("'butterfly.yml' 已經棄用，請使用 '_config.butterfly.yml'")
+        " 'butterfly.yml' is deprecated. Please use '_config.butterfly.yml' "
+      )
+      logger.error(" 'butterfly.yml' 已經棄用，請使用 '_config.butterfly.yml' ")
       process.exit(-1)
     }
   }

scripts/events/stylus.js

@@ -1,16 +1,15 @@
 /**
- * Stylus renderer
+ * stylus
  */
 
 'use strict'
 
-hexo.extend.filter.register('stylus:renderer', style => {
+hexo.extend.filter.register('stylus:renderer', function (style) {
-  const { enable: highlightEnable, line_number: highlightLineNumber } = hexo.config.highlight
+  const { highlight, prismjs } = hexo.config
-  const { enable: prismjsEnable, line_number: prismjsLineNumber } = hexo.config.prismjs
+  style
-
+    .define('$highlight_enable', highlight && highlight.enable)
-  style.define('$highlight_enable', highlightEnable)
+    .define('$highlight_line_number', highlight && highlight.line_number)
-    .define('$highlight_line_number', highlightLineNumber)
+    .define('$prismjs_enable', prismjs && prismjs.enable)
-    .define('$prismjs_enable', prismjsEnable)
+    .define('$prismjs_line_number', prismjs && prismjs.line_number)
-    .define('$prismjs_line_number', prismjsLineNumber)
+    // .import(this.source_dir.replace(/\\/g, '/') + '_data/css/*')
-  // .import(`${this.source_dir.replace(/\\/g, '/')}_data/css/*`)
 })

scripts/filters/post_lazyload.js

@@ -8,20 +8,22 @@
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-const lazyload = htmlContent => {
+function lazyload (htmlContent) {
   const bg = hexo.theme.config.lazyload.placeholder ? urlFor(hexo.theme.config.lazyload.placeholder) : 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
   return htmlContent.replace(/(<img.*? src=)/ig, `$1 "${bg}" data-lazy-src=`)
 }
 
-hexo.extend.filter.register('after_render:html', data => {
+hexo.extend.filter.register('after_render:html', function (data) {
-  const { enable, field } = hexo.theme.config.lazyload
+  const config = hexo.theme.config.lazyload
-  if (!enable || field !== 'site') return
+  if (!config.enable) return
-  return lazyload(data)
+  if (config.field !== 'site') return
+  return lazyload.call(this, data)
 })
 
 hexo.extend.filter.register('after_post_render', data => {
-  const { enable, field } = hexo.theme.config.lazyload
+  const config = hexo.theme.config.lazyload
-  if (!enable || field !== 'post') return
+  if (!config.enable) return
-  data.content = lazyload(data.content)
+  if (config.field !== 'post') return
+  data.content = lazyload.call(this, data.content)
   return data
 })

scripts/filters/random_cover.js

@@ -5,35 +5,40 @@
 
 'use strict'
 
-hexo.extend.filter.register('before_post_render', data => {
+hexo.extend.filter.register('before_post_render', function (data) {
   const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
-  let { cover: coverVal, top_img: topImg } = data
+  let randomCover
+  let coverVal = data.cover
 
   // Add path to top_img and cover if post_asset_folder is enabled
   if (hexo.config.post_asset_folder) {
-    if (topImg && topImg.indexOf('/') === -1 && imgTestReg.test(topImg)) data.top_img = `${data.path}${topImg}`
+    const topImg = data.top_img
-    if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = `${data.path}${coverVal}`
+    if (topImg && topImg.indexOf('/') === -1 && imgTestReg.test(topImg)) data.top_img = data.path + topImg
+    if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = data.path + coverVal
   }
 
   const randomCoverFn = () => {
-    const { cover: { default_cover: defaultCover } } = hexo.theme.config
+    const theme = hexo.theme.config
-    if (!defaultCover) return false
+    if (!(theme.cover && theme.cover.default_cover)) return false
-    if (!Array.isArray(defaultCover)) return defaultCover
+    if (!Array.isArray(theme.cover.default_cover)) return theme.cover.default_cover
-    const num = Math.floor(Math.random() * defaultCover.length)
+    const num = Math.floor(Math.random() * theme.cover.default_cover.length)
-    return defaultCover[num]
+    return theme.cover.default_cover[num]
   }
 
   if (coverVal === false) return data
 
   // If cover is not set, use random cover
   if (!coverVal) {
-    const randomCover = randomCoverFn()
+    randomCover = randomCoverFn()
     data.cover = randomCover
     coverVal = randomCover // update coverVal
   }
 
-  if (coverVal && (coverVal.indexOf('//') !== -1 || imgTestReg.test(coverVal))) {
+  if (coverVal) {
-    data.cover_type = 'img'
+    if (coverVal.indexOf('//') !== -1 || imgTestReg.test(coverVal)) {
+      data.cover_type = 'img'
+      return data
+    }
   }
 
   return data

scripts/helpers/aside_categories.js

@@ -31,7 +31,6 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
     if (parent) { query.parent = parent } else { query.parent = { $exists: false } }
     return categories.find(query).sort(orderby, order).filter((cat) => cat.length)
   }
-  let expandBtn = ''
 
   const hierarchicalList = (t, level, parent, topparent = true) => {
     let result = ''
@@ -60,7 +59,6 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
           }
 
           if (isExpand && isTopParent && child) {
-            expandBtn = ' expandBtn'
             result += `<i class="fas fa-caret-left ${expandClass}"></i>`
           }
 
@@ -93,7 +91,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
             <span>${this._p('aside.card_categories')}</span>
             ${moreButton()}
             </div>
-            <ul class="card-category-list${expandBtn}" id="aside-cat-list">
+            <ul class="card-category-list" id="aside-cat-list">
             ${list[0]}
             </ul>`
 })

scripts/helpers/findArchiveLength.js

@@ -1,36 +1,36 @@
-hexo.extend.helper.register('getArchiveLength', function () {
+hexo.extend.helper.register('findArchiveLength', function (func) {
-  const { archive_generator: archiveGenerator } = hexo.config
+  const allPostsLength = this.site.posts.length
-  if (archiveGenerator && archiveGenerator.enable === false) return this.site.posts.length
+  if (hexo.config.archive_generator && hexo.config.archive_generator.enable === false) return allPostsLength
-  const { yearly, monthly, daily } = archiveGenerator
+  const { yearly, monthly, daily } = hexo.config.archive_generator
   const { year, month, day } = this.page
-  if (yearly === false || !year) return this.site.posts.length
+  if (yearly === false || !year) return allPostsLength
 
   const posts = this.site.posts.sort('date')
 
   const compareFunc = (type, y1, m1, d1, y2, m2, d2) => {
-    switch (type) {
+    if (type === 'year') {
-      case 'year':
+      return y1 === y2
-        return y1 === y2
+    } else if (type === 'month') {
-      case 'month':
+      return y1 === y2 && m1 === m2
-        return y1 === y2 && m1 === m2
+    } else if (type === 'day') {
-      case 'day':
+      return y1 === y2 && m1 === m2 && d1 === d2
-        return y1 === y2 && m1 === m2 && d1 === d2
-      default:
-        return false
     }
   }
 
   const generateDateObj = (type) => {
-    return posts.reduce((dateObj, post) => {
+    const dateObj = []
+    let length = 0
+
+    posts.forEach(post => {
       const date = post.date.clone()
       const year = date.year()
       const month = date.month() + 1
       const day = date.date()
-      const lastData = dateObj[dateObj.length - 1]
+      const lastData = dateObj[length - 1]
 
       if (!lastData || !compareFunc(type, lastData.year, lastData.month, lastData.day, year, month, day)) {
         const name = type === 'year' ? year : type === 'month' ? `${year}-${month}` : `${year}-${month}-${day}`
-        dateObj.push({
+        length = dateObj.push({
           name,
           year,
           month,
@@ -40,19 +40,19 @@ hexo.extend.helper.register('getArchiveLength', function () {
       } else {
         lastData.count++
       }
+    })
 
-      return dateObj
+    return dateObj
-    }, [])
   }
 
-  const data = this.fragment_cache('createArchiveObj', () => {
+  const data = func('createArchiveObj', () => {
-    const dateObjs = []
+    const yearObj = yearly ? generateDateObj('year') : []
-    if (yearly) dateObjs.push(...generateDateObj('year'))
+    const monthObj = monthly ? generateDateObj('month') : []
-    if (monthly) dateObjs.push(...generateDateObj('month'))
+    const dayObj = daily ? generateDateObj('day') : []
-    if (daily) dateObjs.push(...generateDateObj('day'))
+    const fullObj = [...yearObj, ...monthObj, ...dayObj]
-    return dateObjs
+    return fullObj
   })
 
-  const name = month ? (day ? `${year}-${month}-${day}` : `${year}-${month}`) : year
+  const name = month ? day ? `${year}-${month}-${day}` : `${year}-${month}` : year
   return data.find(item => item.name === name).count
 })

scripts/helpers/inject_head_js.js

@@ -7,99 +7,87 @@
 
 hexo.extend.helper.register('inject_head_js', function () {
   const { darkmode, aside } = this.theme
-  const start = darkmode.start || 6
+  const start = darkmode.start ? darkmode.start : 6
-  const end = darkmode.end || 18
+  const end = darkmode.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 createLocalStore = () => {
+  const localStore = `
-    return `
+    win.saveToLocal = {
-      win.saveToLocal = {
+      set: function setWithExpiry(key, value, ttl) {
-        set: (key, value, ttl) => {
+        if (ttl === 0) return
-          if (ttl === 0) return
+        const now = new Date()
-          const now = Date.now()
+        const expiryDay = ttl * 86400000
-          const expiry = now + ttl * 86400000
+        const item = {
-          const item = {
+          value: value,
-            value,
+          expiry: now.getTime() + expiryDay,
-            expiry
-          }
-          localStorage.setItem(key, JSON.stringify(item))
-        },
-      
-        get: key => {
-          const itemStr = localStorage.getItem(key)
-      
-          if (!itemStr) {
-            return undefined
-          }
-          const item = JSON.parse(itemStr)
-          const now = Date.now()
-      
-          if (now > item.expiry) {
-            localStorage.removeItem(key)
-            return undefined
-          }
-          return item.value
         }
+        localStorage.setItem(key, JSON.stringify(item))
+      },
+
+      get: function getWithExpiry(key) {
+        const itemStr = localStorage.getItem(key)
+
+        if (!itemStr) {
+          return undefined
+        }
+        const item = JSON.parse(itemStr)
+        const now = new Date()
+
+        if (now.getTime() > item.expiry) {
+          localStorage.removeItem(key)
+          return undefined
+        }
+        return item.value
       }
-    `
+    }
-  }
+  `
 
   // https://stackoverflow.com/questions/16839698/jquery-getscript-alternative-in-native-javascript
-  const createGetScript = () => {
+  const getScript = `
-    return `
+    win.getScript = url => new Promise((resolve, reject) => {
-      win.getScript = (url, attr = {}) => new Promise((resolve, reject) => {
+      const script = document.createElement('script')
-        const script = document.createElement('script')
+      script.src = url
-        script.src = url
+      script.async = true
-        script.async = true
+      script.onerror = reject
-        script.onerror = reject
+      script.onload = script.onreadystatechange = function() {
-        script.onload = script.onreadystatechange = function() {
+        const loadState = this.readyState
-          const loadState = this.readyState
+        if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-          if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+        script.onload = script.onreadystatechange = null
-          script.onload = script.onreadystatechange = null
+        resolve()
-          resolve()
+      }
-        }
+      document.head.appendChild(script)
+    })
+  `
 
-        Object.keys(attr).forEach(key => {
+  const getCSS = `
-          script.setAttribute(key, attr[key])
+    win.getCSS = (url,id = false) => new Promise((resolve, reject) => {
-        })
+      const link = document.createElement('link')
+      link.rel = 'stylesheet'
+      link.href = url
+      if (id) link.id = id
+      link.onerror = reject
+      link.onload = link.onreadystatechange = function() {
+        const loadState = this.readyState
+        if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+        link.onload = link.onreadystatechange = null
+        resolve()
+      }
+      document.head.appendChild(link)
+    })
+  `
 
-        document.head.appendChild(script)
+  let darkmodeJs = ''
-      })
+  if (darkmode.enable) {
-    `
+    darkmodeJs = `
-  }
+      win.activateDarkMode = function () {
-
-  const createGetCSS = () => {
-    return `
-      win.getCSS = (url, id = false) => new Promise((resolve, reject) => {
-        const link = document.createElement('link')
-        link.rel = 'stylesheet'
-        link.href = url
-        if (id) link.id = id
-        link.onerror = reject
-        link.onload = link.onreadystatechange = function() {
-          const loadState = this.readyState
-          if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-          link.onload = link.onreadystatechange = null
-          resolve()
-        }
-        document.head.appendChild(link)
-      })
-    `
-  }
-
-  const createDarkmodeJs = () => {
-    if (!darkmode.enable) return ''
-
-    let darkmodeJs = `
-      win.activateDarkMode = () => {
         document.documentElement.setAttribute('data-theme', 'dark')
         if (document.querySelector('meta[name="theme-color"]') !== null) {
           document.querySelector('meta[name="theme-color"]').setAttribute('content', '${themeColorDark}')
         }
       }
-      win.activateLightMode = () => {
+      win.activateLightMode = function () {
         document.documentElement.setAttribute('data-theme', 'light')
         if (document.querySelector('meta[name="theme-color"]') !== null) {
           document.querySelector('meta[name="theme-color"]').setAttribute('content', '${themeColorLight}')
@@ -126,7 +114,7 @@ hexo.extend.helper.register('inject_head_js', function () {
               const isNight = hour <= ${start} || hour >= ${end}
               isNight ? activateDarkMode() : activateLightMode()
             }
-            window.matchMedia('(prefers-color-scheme: dark)').addListener(e => {
+            window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
               if (saveToLocal.get('theme') === undefined) {
                 e.matches ? activateDarkMode() : activateLightMode()
               }
@@ -145,18 +133,15 @@ hexo.extend.helper.register('inject_head_js', function () {
         `
     } else {
       darkmodeJs += `
-        if (t === 'dark') activateDarkMode()
+          if (t === 'dark') activateDarkMode()
-        else if (t === 'light') activateLightMode()
+          else if (t === 'light') activateLightMode()
-      `
+        `
     }
-
-    return darkmodeJs
   }
 
-  const createAsideStatus = () => {
+  let asideStatus = ''
-    if (!aside.enable || !aside.button) return ''
+  if (aside.enable && aside.button) {
-
+    asideStatus = `
-    return `
       const asideStatus = saveToLocal.get('aside-status')
       if (asideStatus !== undefined) {
         if (asideStatus === 'hide') {
@@ -168,16 +153,14 @@ hexo.extend.helper.register('inject_head_js', function () {
     `
   }
 
-  const createDetectApple = () => {
+  const detectApple = `
-    return `
+    const detectApple = () => {
-      const detectApple = () => {
+      if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
-        if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
+        document.documentElement.classList.add('apple')
-          document.documentElement.classList.add('apple')
-        }
       }
-      detectApple()
+    }
+    detectApple()
     `
-  }
 
-  return `<script>(win=>{${createLocalStore() + createGetScript() + createGetCSS() + createDarkmodeJs() + createAsideStatus() + createDetectApple()}})(window)</script>`
+  return `<script>(win=>{${localStore + getScript + getCSS + darkmodeJs + asideStatus + detectApple}})(window)</script>`
 })

scripts/helpers/page.js

@@ -1,3 +1,10 @@
+/**
+ * Butterfly
+ * @example
+ *  page_description()
+ *  cloudTags(source, minfontsize, maxfontsize, limit)
+ */
+
 'use strict'
 
 const { stripHTML, escapeHTML, prettyUrls } = require('hexo-util')
@@ -53,8 +60,12 @@ hexo.extend.helper.register('md5', function (path) {
 })
 
 hexo.extend.helper.register('injectHtml', function (data) {
+  let result = ''
   if (!data) return ''
-  return data.join('')
+  for (let i = 0; i < data.length; i++) {
+    result += data[i]
+  }
+  return result
 })
 
 hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
@@ -84,5 +95,8 @@ hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
 
 hexo.extend.helper.register('isImgOrUrl', function (path) {
   const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
-  return path.indexOf('//') !== -1 || imgTestReg.test(path)
+  if (path.indexOf('//') !== -1 || imgTestReg.test(path)) {
+    return true
+  }
+  return false
 })

scripts/helpers/series.js

@@ -1,22 +0,0 @@
-'use strict'
-
-hexo.extend.helper.register('groupPosts', function () {
-  const getGroupArray = array => {
-    const groups = {}
-    array.forEach(item => {
-      const Key = item.series
-      if (!Key) return
-      groups[Key] = groups[Key] || []
-      groups[Key].push(item)
-    })
-    return groups
-  }
-
-  const sortPosts = posts => {
-    const { orderBy = 'date', order = 1 } = this.theme.aside.card_post_series
-    if (orderBy === 'title') return posts.sort('title', order)
-    return posts.sort('date', order)
-  }
-
-  return getGroupArray(sortPosts(this.site.posts))
-})

scripts/tag/button.js

@@ -9,9 +9,17 @@
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-const btn = args => {
+function btn (args) {
   args = args.join(' ').split(',')
-  const [url = '', text = '', icon = '', option = ''] = args.map(arg => arg.trim())
+  let url = args[0] || ''
+  let text = args[1] || ''
+  let icon = args[2] || ''
+  let option = args[3] || ''
+
+  url = url.trim()
+  text = text.trim()
+  icon = icon.trim()
+  option = option.trim()
 
   return `<a class="btn-beautify ${option}" href="${urlFor(url)}" 
   title="${text}">${icon.length ? `<i class="${icon}"></i>` : ''}${text.length ? `<span>${text}</span>` : ''}</a>`

scripts/tag/gallery.js

@@ -2,25 +2,23 @@
  * Butterfly
  * galleryGroup and gallery
  * {% galleryGroup [name] [descr] [url] [img] %}
- *
+ * {% gallery [lazyload],[rowHeight],[limit] %}
- * {% gallery [button],%}
+ * {% gallery url,[url],[lazyload],[rowHeight],[limit] %}
- * {% gallery url,[url],[button]%}
  */
 
 'use strict'
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-const gallery = (args, content) => {
+function gallery (args, content) {
+  const { data, languages } = hexo.theme.i18n
   args = args.join(' ').split(',')
-  let button = false
+  let rowHeight, limit, lazyload, type, dataStr
-  let type = 'data'
-  let dataStr = ''
 
   if (args[0] === 'url') {
-    [type, dataStr, button] = args // url,[link],[lazyload]
+    [type, dataStr, lazyload, rowHeight = 220, limit = 10] = args // url,[link],[lazyload],[rowHeight],[limit]
   } else {
-    [button] = args // [lazyload]
+    [lazyload, rowHeight = 220, limit = 10] = args // [lazyload],[rowHeight],[limit]
     const regex = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
     let m
     const arr = []
@@ -38,24 +36,30 @@ const gallery = (args, content) => {
     dataStr = JSON.stringify(arr)
   }
 
-  return `<div class="gallery-container" data-type="${type}" data-button="${button}">
+  type = type ? ' url' : ' data'
-      <div class="gallery-data">${dataStr}</div>
+  const lazyloadClass = lazyload === 'true' ? 'lazyload' : ''
-      <div class="gallery-items">
+
-      </div>
+  return `<div class="gallery">
+    <div class="fj-gallery ${lazyloadClass + type}" data-rowHeight="${rowHeight}" data-limit="${limit}">
+    <span class="gallery-data">${dataStr}</span>
+    </div>
+    <button class="gallery-load-more"><span>${data[languages[0]].load_more}</span><i class="fa-solid fa-arrow-down"></i></button>
     </div>`
 }
 
-const galleryGroup = args => {
+function galleryGroup (args) {
-  const [name, descr, url, img] = args
+  const name = args[0]
-  const imgUrl = urlFor(img)
+  const descr = args[1]
-  const urlLink = urlFor(url)
+  const url = urlFor(args[2])
+  const img = urlFor(args[3])
 
-  return `<figure class="gallery-group">
+  return `
-  <img class="gallery-group-img no-lightbox" src='${imgUrl}' alt="Group Image Gallery">
+  <figure class="gallery-group">
+  <img class="gallery-group-img no-lightbox" src='${img}' alt="Group Image Gallery">
   <figcaption>
   <div class="gallery-group-name">${name}</div>
   <p>${descr}</p>
-  <a href='${urlLink}'></a>
+  <a href='${url}'></a>
   </figcaption>
   </figure>
   `

scripts/tag/hide.js

@@ -16,46 +16,51 @@
 
 'use strict'
 
-const parseArgs = args => {
+function hideInline (args) {
-  return args.join(' ').split(',')
+  args = args.join(' ').split(',')
-}
+  const content = args[0]
+  const display = args[1] || 'Click'
+  const bg = args[2] || false
+  const color = args[3] || false
+  let group = 'style="'
 
-const generateStyle = (bg, color) => {
+  if (bg) group += `background-color: ${bg};`
-  let style = 'style="'
+  if (color) group += `color: ${color}`
-  if (bg) {
+  group += '"'
-    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 `<span class="hide-inline"><button type="button" class="hide-button" ${group}>${display}
   </button><span class="hide-content">${content}</span></span>`
 }
 
-const hideBlock = (args, content) => {
+function hideBlock (args, content) {
-  const [display = 'Click', bg = false, color = false] = parseArgs(args)
+  args = args.join(' ').split(',')
-  const group = generateStyle(bg, color)
+  const display = args[0] || 'Click'
+  const bg = args[1] || false
+  const color = args[2] || false
+  let group = 'style="'
+
+  if (bg) group += `background-color: ${bg};`
+  if (color) group += `color: ${color}`
+  group += '"'
 
   return `<div class="hide-block"><button type="button" class="hide-button" ${group}>${display}
     </button><div class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></div>`
 }
 
-const hideToggle = (args, content) => {
+function hideToggle (args, content) {
-  const [display, bg = false, color = false] = parseArgs(args)
+  args = args.join(' ').split(',')
-  const group = generateStyle(bg, color)
+  const display = args[0]
+  const bg = args[1] || false
+  const color = args[2] || false
+  let group = 'style="'
   let border = ''
 
   if (bg) {
     border = `style="border: 1px solid ${bg}"`
+    group += `background-color: ${bg};`
   }
+  if (color) group += `color: ${color}`
+  group += '"'
 
   return `<details class="toggle" ${border}><summary class="toggle-button" ${group}>${display}</summary><div class="toggle-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></details>`
 }

scripts/tag/inlineImg.js

@@ -1,19 +1,17 @@
 /**
  * inlineImg 圖片
- * @param {Array} args 圖片名稱和高度
+ * {% inlineImg src height %}
- * @param {string} args[0] 圖片名稱
- * @param {number} args[1] 圖片高度
- * @returns {string} 圖片標籤
  */
 
 'use strict'
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-const inlineImg = ([img, height = '']) => {
+function inlineImg (args) {
-  const heightStyle = height ? `style="height:${height}"` : ''
+  const img = args[0]
-  const src = urlFor(img)
+  const height = args[1] ? `style="height:${args[1]}"` : ''
-  return `<img class="inline-img" src="${src}" ${heightStyle} />`
+
+  return `<img class="inline-img" src="${urlFor(img)}" ${height}/>`
 }
 
 hexo.extend.tag.register('inlineImg', inlineImg, { ends: false })

scripts/tag/label.js

@@ -6,8 +6,10 @@
 
 'use strict'
 
-const addLabel = args => {
+function addLabel (args, content) {
-  const [text, className = 'default'] = args
+  const text = args[0]
+  const className = args[1] || 'default'
+
   return `<mark class="hl-label ${className}">${text}</mark> `
 }
 

scripts/tag/mermaid.js

@@ -8,7 +8,7 @@
 
 const { escapeHTML } = require('hexo-util')
 
-const mermaid = (args, content) => {
+function mermaid (args, content) {
   return `<div class="mermaid-wrap"><pre class="mermaid-src" hidden>
   ${escapeHTML(content)}
   </pre></div>`

scripts/tag/note.js

@@ -6,10 +6,10 @@
 
 'use strict'
 
-const postNote = (args, content) => {
+function postNote (args, content) {
   const styleConfig = hexo.theme.config.note.style
-  const noteTag = ['flat', 'modern', 'simple', 'disabled']
+  const lastArgs = args[args.length - 1]
-  if (!noteTag.includes(args[args.length - 1])) {
+  if (!(lastArgs === 'flat' || lastArgs === 'modern' || lastArgs === 'simple' || lastArgs === 'disabled')) {
     args.push(styleConfig)
   }
 

scripts/tag/score.js

@@ -3,20 +3,20 @@
  * {% score %}
  */
 
-'use strict'
+'use strict';
 
-const score = (args, content) => {
+function score(args, content) {
-  const escapeHtmlTags = s => {
+    function escapeHtmlTags(s) {
-    const lookup = {
+        let lookup = {
-      '&': '&',
+            '&': "&",
-      '"': '"',
+            '"': """,
-      '\'': ''',
+            '\'': "'",
-      '<': '&lt;',
+            '<': "&lt;",
-      '>': '&gt;'
+            '>': "&gt;"
+        };
+        return s.replace(/[&"'<>]/g, c => lookup[c]);
     }
-    return s.replace(/[&"'<>]/g, c => lookup[c])
+    return `<div class="abc-music-sheet">${escapeHtmlTags(content)}</div>`;
-  }
-  return `<div class="abc-music-sheet">${escapeHtmlTags(content)}</div>`
 }
 
-hexo.extend.tag.register('score', score, { ends: true })
+hexo.extend.tag.register('score', score, {ends: true});

scripts/tag/series.js

@@ -1,69 +0,0 @@
-/**
- * series plugin
- * Syntax:
- *  {% series [series name] %}
- * Usage:
- * {% series %}
- * {% series series1 %}
- */
-
-'use strict'
-
-const urlFor = require('hexo-util').url_for.bind(hexo)
-const groups = {}
-
-hexo.extend.filter.register('before_post_render', data => {
-  if (!hexo.theme.config.series.enable) return data
-  const { layout, series } = data
-  if (layout === 'post' && series) {
-    groups[series] = groups[series] || []
-    groups[series].push({
-      title: data.title,
-      path: data.path,
-      date: data.date.unix()
-    })
-  }
-  return data
-})
-
-function series (args) {
-  const { series } = hexo.theme.config
-  if (!series.enable) {
-    hexo.log.warn('Series plugin is disabled in the theme config')
-    return ''
-  }
-
-  const seriesArr = args.length ? groups[args[0]] : groups[this.series]
-
-  if (!seriesArr) {
-    hexo.log.warn(`There is no series named "${args[0]}"`)
-    return ''
-  }
-
-  const isAsc = (series.order || 1) === 1 // 1: asc, -1: desc
-  const isSortByTitle = series.orderBy === 'title'
-
-  const compareFn = (a, b) => {
-    const itemA = isSortByTitle ? a.title.toUpperCase() : a.date
-    const itemB = isSortByTitle ? b.title.toUpperCase() : b.date
-
-    if (itemA < itemB) {
-      return isAsc ? -1 : 1
-    }
-    if (itemA > itemB) {
-      return isAsc ? 1 : -1
-    }
-    return 0
-  }
-
-  seriesArr.sort(compareFn)
-
-  let result = ''
-  seriesArr.forEach(ele => {
-    result += `<li><a href="${urlFor(ele.path)}" title="${ele.title}">${ele.title}</a></li>`
-  })
-
-  return series.number ? `<ol>${result}</ol>` : `<ul>${result}</ul>`
-}
-
-hexo.extend.tag.register('series', series, { ends: false })

scripts/tag/tabs.js

@@ -6,22 +6,24 @@
 
 'use strict'
 
-const postTabs = (args, content) => {
+function postTabs (args, content) {
   const tabBlock = /<!--\s*tab (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtab\s*-->/g
+
   args = args.join(' ').split(',')
   const tabName = args[0]
   const tabActive = Number(args[1]) || 0
+
   const matches = []
   let match
   let tabId = 0
   let tabNav = ''
   let tabContent = ''
-  let noDefault = true
 
   !tabName && hexo.log.warn('Tabs block must have unique name!')
 
   while ((match = tabBlock.exec(content)) !== null) {
-    matches.push(match[1], match[2])
+    matches.push(match[1])
+    matches.push(match[2])
   }
 
   for (let i = 0; i < matches.length; i += 2) {
@@ -42,21 +44,17 @@ const postTabs = (args, content) => {
     const icon = tabIcon.trim()
     tabIcon.length > 0 && (tabIcon = `<i class="${icon}"${isOnlyicon}></i>`)
 
-    let isActive = ''
+    const toTop = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="fas fa-arrow-up"></i></button>'
-    if ((tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1)) {
+
-      isActive = ' active'
+    const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : ''
-      noDefault = false
+    tabNav += `<li class="tab${isActive}"><button type="button" data-href="#${tabHref}">${tabIcon + tabCaption.trim()}</button></li>`
-    }
+    tabContent += `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent + toTop}</div>`
-    tabNav += `<button type="button" class="tab ${isActive}" data-href="${tabHref}">${tabIcon + tabCaption.trim()}</button>`
-    tabContent += `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent}</div>`
   }
 
-  const toTop = '<div class="tab-to-top"><button type="button" aria-label="scroll to top"><i class="fas fa-arrow-up"></i></button></div>'
+  tabNav = `<ul class="nav-tabs">${tabNav}</ul>`
-
-  tabNav = `<ul class="nav-tabs${noDefault ? ' no-default' : ''}">${tabNav}</ul>`
   tabContent = `<div class="tab-contents">${tabContent}</div>`
 
-  return `<div class="tabs" id="${tabName.toLowerCase().split(' ').join('-')}">${tabNav + tabContent + toTop}</div>`
+  return `<div class="tabs" id="${tabName.toLowerCase().split(' ').join('-')}">${tabNav + tabContent}</div>`
 }
 
 hexo.extend.tag.register('tabs', postTabs, { ends: true })

scripts/tag/timeline.js

@@ -5,15 +5,15 @@
 
 'use strict'
 
-const timeLineFn = (args, content) => {
+function timeLineFn (args, content) {
   const tlBlock = /<!--\s*timeline (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtimeline\s*-->/g
 
   let result = ''
   let color = ''
-  let text = ''
   if (args.length) {
-    [text, color] = args.join(' ').split(',')
+    args = args.join(' ').split(',')
-    const mdContent = hexo.render.renderSync({ text, engine: 'markdown' })
+    color = args[1]
+    const mdContent = hexo.render.renderSync({ text: args[0], engine: 'markdown' })
     result += `<div class='timeline-item headline'><div class='timeline-item-title'><div class='item-circle'>${mdContent}</div></div></div>`
   }
 

source/css/_global/function.styl

@@ -72,30 +72,6 @@
       cursor: pointer
       transition: all .3s ease-out
 
-.custom-hr
-  position: relative
-  margin: 40px auto
-  border: 2px dashed var(--hr-border)
-
-  if hexo-config('hr_icon.enable')
-    width: calc(100% - 4px)
-
-    &:hover
-      &:before
-        left: calc(95% - 20px)
-
-    &:before
-      position: absolute
-      top: $hr-icon-top
-      left: 5%
-      z-index: 1
-      color: var(--hr-before-color)
-      content: $hr-icon
-      font-size: 20px
-      line-height: 1
-      transition: all 1s ease-in-out
-      @extend .fontawesomeIcon
-
 maxWidth600()
   @media screen and (max-width: 600px)
     {block}
@@ -134,7 +110,7 @@ if hexo-config('enter_transitions')
   #footer
     animation: bottom-top 1s
 
-  #page-header:not(.full_page)
+  #page-header
     animation: header-effect 1s
 
   #site-title,
@@ -155,7 +131,7 @@ if hexo-config('enter_transitions')
     &.open
       for i in 1 2 3 4
         > :nth-child({i})
-          animation: sidebarItem (i / 5s)
+          animation: sidebarItem (i / 5)s
 
 .scroll-down-effects
   animation: scroll-down-effect 1.5s infinite
@@ -169,16 +145,16 @@ if hexo-config('avatar.effect') == true
 
 @keyframes scroll-down-effect
   0%
+    top: 0
     opacity: .4
-    transform: translate(0, 0)
 
   50%
+    top: -16px
     opacity: 1
-    transform: translate(0, -16px)
 
   100%
+    top: 0
     opacity: .4
-    transform: translate(0, 0)
 
 @keyframes header-effect
   0%
@@ -198,12 +174,12 @@ if hexo-config('avatar.effect') == true
 
 @keyframes bottom-top
   0%
+    margin-top: 50px
     opacity: 0
-    transform: translateY(50px)
 
   100%
+    margin-top: 0
     opacity: 1
-    transform: translateY(0)
 
 @keyframes titleScale
   0%

source/css/_global/index.styl

@@ -34,8 +34,6 @@
   --headline-presudo: #a0a0a0
   --scrollbar-color: $scrollbar-color
   --default-bg-color: $theme-color
-  --zoom-bg: #fff
-  --mark-bg: alpha($dark-black, .3)
 
 body
   position: relative
@@ -49,7 +47,6 @@ body
 
   if !hexo-config('copy.enable')
     user-select: none
-    -webkit-user-select: none
 
 // scrollbar - chrome/safari
 *::-webkit-scrollbar
@@ -99,6 +96,30 @@ h6
 *
   box-sizing: border-box
 
+hr
+  position: relative
+  margin: 40px auto
+  border: 2px dashed var(--hr-border)
+
+  if hexo-config('hr_icon.enable')
+    width: calc(100% - 4px)
+
+    &:hover
+      &:before
+        left: calc(95% - 20px)
+
+    &:before
+      position: absolute
+      top: $hr-icon-top
+      left: 5%
+      z-index: 1
+      color: var(--hr-before-color)
+      content: $hr-icon
+      font-size: 20px
+      line-height: 1
+      transition: all 1s ease-in-out
+      @extend .fontawesomeIcon
+
 .table-wrap
   overflow-x: scroll
   margin: 0 0 20px
@@ -153,6 +174,9 @@ if $site-name-font
 .is-center
   text-align: center
 
+.copy-true
+  user-select: all
+
 .pull-left
   float: left
 

source/css/_highlight/highlight.styl

@@ -13,16 +13,6 @@ wordWrap = $highlight_enable && !$highlight_line_number && hexo-config('code_wor
   --hlscrollbar-bg: $highlight-scrollbar
   --hlexpand-bg: linear-gradient(180deg, rgba($highlight-background, .6), rgba($highlight-background, .9))
 
-[data-theme='dark']
-  --hl-color: alpha(#FFFFFF, .7)
-  --hl-bg: lighten(#121212, 2)
-  --hltools-bg: lighten(#121212, 3)
-  --hltools-color: #90a4ae
-  --hlnumber-bg: lighten(#121212, 2)
-  --hlnumber-color: alpha(#FFFFFF, .4)
-  --hlscrollbar-bg: lighten(#121212, 5)
-  --hlexpand-bg: linear-gradient(180deg, rgba(lighten(#121212, 2), .6), rgba(lighten(#121212, 2), .9))
-
 if $highlight_enable
   @require 'highlight/index'
 
@@ -85,15 +75,6 @@ $code-block
         &:hover
           border-bottom-color: var(--hl-color)
 
-    &.copy-true
-      user-select: all
-      -webkit-user-select: all
-
-      & > table,
-      & > pre
-        display: block !important
-        opacity: 0
-
   .highlight-tools
     position: relative
     display: flex
@@ -105,13 +86,8 @@ $code-block
     color: var(--hltools-color)
     font-size: $code-font-size
 
-    &.closed
+    &.closed ~ *
-      & ~ *
+      display: none
-        display: none
-
-      .expand
-        transition: all .3s
-        transform: rotate(-90deg) !important
 
     .expand
       position: absolute
@@ -122,6 +98,10 @@ $code-block
       & + .code-lang
         left: 1.7em
 
+      &.closed
+        transition: all .3s
+        transform: rotate(-90deg) !important
+
     .code-lang
       position: absolute
       left: 14px
@@ -129,7 +109,6 @@ $code-block
       font-weight: bold
       font-size: 1.15em
       user-select: none
-      -webkit-user-select: none
 
     .copy-notice
       position: absolute
@@ -148,7 +127,6 @@ $code-block
 
   .gutter
     user-select: none
-    -webkit-user-select: none
 
   .gist table
     width: auto

source/css/_highlight/prismjs/line-number.styl

@@ -27,7 +27,6 @@
         font-size: 100%
         pointer-events: none
         user-select: none
-        -webkit-user-select: none
 
         & > span
           display: block

source/css/_layout/aside.styl

@@ -179,13 +179,6 @@
 
       > .parent
         > a
-          &.expand
-            i
-              transform: rotate(-90deg)
-
-            & + .child
-              display: block
-
           .card-category-list
             &-name
               width: 70% !important
@@ -194,12 +187,15 @@
               width: calc(100% - 70% - 20px)
               text-align: right
 
-          i
+        i
-            float: right
+          float: right
-            margin-right: -.5em
+          margin-right: -.5em
-            padding: .5em
+          padding: .5em
-            transition: transform .3s
+          transition: transform .3s
-            transform: rotate(0)
+          transform: rotate(0)
+
+          &.expand
+            transform: rotate(-90deg)
 
         if hexo-config('aside.card_categories.expand') == false
           > .child
@@ -224,19 +220,16 @@
 
     +maxWidth900()
       position: fixed
-      right: 55px
+      right: -100%
       bottom: 30px
       z-index: 100
       max-width: $toc-mobile-maxWidth
       max-height: calc(100% - 60px)
       width: $toc-mobile-width
-      transition: none
+      opacity: 0
-      transform: scale(0)
+      transition: initial
       transform-origin: right bottom
 
-      &.open
-        transform: scale(1)
-
     .toc-percentage
       float: right
       margin-top: -9px
@@ -249,7 +242,6 @@
       overflow-y: overlay
       margin: 0 -24px
       max-height: calc(100vh - 120px)
-      width: calc(100% + 48px)
 
       +maxWidth900()
         max-height: calc(100vh - 140px)

source/css/_layout/comments.styl

@@ -2,18 +2,13 @@
   .comment-head
     margin-bottom: 20px
 
-    &:after
-      display: block
-      clear: both
-      content: ''
-
     .comment-headline
       display: inline-block
       vertical-align: middle
       font-weight: 700
       font-size: 1.43em
 
-    .comment-switch
+    #comment-switch
       display: inline-block
 
       if hexo-config('comments.text')
@@ -35,7 +30,7 @@
       .second-comment
         color: $comments-switch-second-text
 
-      #switch-btn
+      .switch-btn
         position: relative
         display: inline-block
         margin: -4px 8px 0
@@ -58,24 +53,12 @@
           content: ''
           transition: .4s
 
+        &.move
+          background-color: $comments-switch-second-text
+
+          &:before
+            transform: translateX(20px)
+
   .comment-wrap
-    > div
+    > div:nth-child(2)
-      animation: tabshow .5s
+      display: none
-
-      &:nth-child(2)
-        display: none
-
-  &.move
-    #switch-btn
-      background-color: $comments-switch-second-text
-
-      &:before
-        transform: translateX(20px)
-
-    .comment-wrap
-      > div
-        &:first-child
-          display: none
-
-        &:last-child
-          display: block

source/css/_layout/footer.styl

@@ -5,12 +5,12 @@
   background-position: bottom
   background-size: cover
 
-  if hexo-config('footer_bg') != false && hexo-config('mask.footer')
+  if hexo-config('footer_bg') != false
     &:before
       position: absolute
       width: 100%
       height: 100%
-      background-color: var(--mark-bg)
+      background-color: alpha($dark-black, .5)
       content: ''
 
 #footer-wrap

source/css/_layout/head.styl

@@ -7,13 +7,12 @@
   background-repeat: no-repeat
   transition: all .5s
 
-  if hexo-config('mask.header')
+  &:not(.not-top-img):before
-    &:not(.not-top-img):before
+    position: absolute
-      position: absolute
+    width: 100%
-      width: 100%
+    height: 100%
-      height: 100%
+    background-color: alpha($dark-black, .3)
-      background-color: var(--mark-bg)
+    content: ''
-      content: ''
 
   // index
   &.full_page
@@ -51,6 +50,7 @@
   #site_social_icons
     display: none
     margin: 0 auto
+    width: 300px
     text-align: center
 
     +maxWidth768()
@@ -64,7 +64,7 @@
 
   #scroll-down
     position: absolute
-    bottom: 10px
+    bottom: 0
     width: 100%
     cursor: pointer
 
@@ -72,7 +72,7 @@
       position: relative
       width: 100%
       color: var(--light-grey)
-      font-size: 20px
+      font-size: 30px
 
   // page
   &.not-home-page
@@ -97,6 +97,9 @@
     +maxWidth768()
       height: 360px
 
+    &:before
+      background-color: alpha($dark-black, .5)
+
   #post-info
     position: absolute
     bottom: 100px

source/css/_layout/post.styl

@@ -1,12 +1,13 @@
 beautify()
   headStyle(fontsize)
-    padding-left: unit(fontsize + 8, 'px')
+    padding-left: unit(fontsize + 12, 'px')
 
     &:before
-      font-size: unit(fontsize - 2, 'px')
+      margin-left: unit((-(fontsize + 6)), 'px')
+      font-size: unit(fontsize, 'px')
 
     &:hover
-      padding-left: unit(fontsize + 12, 'px')
+      padding-left: unit(fontsize + 18, 'px')
 
   h1,
   h2,
@@ -21,7 +22,6 @@ beautify()
       top: calc(50% - 7px)
       color: $title-prefix-icon-color
       content: $title-prefix-icon
-      left: 0
       line-height: 1
       transition: all .2s ease-out
       @extend .fontawesomeIcon
@@ -65,17 +65,11 @@ beautify()
 
   ul > li
     list-style-type: circle
-  
-  hr
-    @extend .custom-hr
 
 #article-container
   word-wrap: break-word
   overflow-wrap: break-word
 
-  if hexo-config('text_align_justify')
-    text-align: justify
-
   a
     color: $theme-link-color
 
@@ -108,15 +102,35 @@ beautify()
     font-family: Monaco, 'Ubuntu Mono', monospace
     line-height: 1em
 
-  if hexo-config('anchor.click_to_scroll')
+  if hexo-config('anchor.button.enable')
     a.headerlink
-      position: absolute
+      &:after
-      top: 0
+        @extend .fontawesomeIcon
-      right: 0
+        float: right
-      left 0
+        color: var(--headline-presudo)
-      bottom: 0
+        content: $archor-button-icon
-      width 100%
+        font-size: .95em
-      height: 100%
+        transition: all .3s
+
+      &:hover
+        &:after
+          color: var(--pseudo-hover)
+
+    if !hexo-config('anchor.button.always_show')
+      a.headerlink
+        &:after
+          opacity: 0
+
+      h1,
+      h2,
+      h3,
+      h4,
+      h5,
+      h6
+        &:hover
+          a.headerlink
+            &:after
+              opacity: 1
 
   ol,
   ul
@@ -142,6 +156,14 @@ beautify()
     else if hexo-config('beautify.field') == 'post'
       &.post-content
         beautify()
+  else
+    hr
+      margin: 20px 0
+      border: 1px inset
+      width 100%
+
+      &:before
+        content: none
 
 #post
   .tag_share
@@ -209,9 +231,6 @@ beautify()
         color: $light-blue
         font-weight: bold
 
-        i
-          margin-right: 3px
-
       &-info
         padding-left: 6px
 

source/css/_layout/reward.styl

@@ -15,9 +15,6 @@
     color: var(--btn-color)
     cursor: pointer
 
-    i
-      margin-right: 5px
-
   &:hover
     .reward-button
       background: var(--btn-hover-color)

source/css/_layout/rightside.styl

@@ -6,10 +6,6 @@
   opacity: 0
   transition: all .5s
 
-  &.rightside-show
-    opacity: .8
-    transform: translate(-58px, 0)
-
   #rightside-config-hide
     height: 0
     opacity: 0

source/css/_layout/sidebar.styl

@@ -13,8 +13,7 @@
     right: -($sidebar-width)
     z-index: 103
     overflow-x: hidden
-    overflow-y: scroll
+    overflow-y: auto
-    padding-left: 5px
     width: $sidebar-width
     height: 100%
     background: var(--sidebar-bg)
@@ -33,7 +32,7 @@
       margin: 20px auto
 
     .menus_items
-      padding: 0 5px
+      padding: 0 10px 40px
 
       .site-page
         @extend .limit-one-line
@@ -54,7 +53,7 @@
           & > i:last-child
             position: absolute
             top: .78em
-            right: 13px
+            right: 18px
             transition: transform .3s
 
           &.hide
@@ -66,5 +65,4 @@
 
       .menus_item_child
         margin: 0
-        padding-left: 25px
         list-style: none