hexo-theme-solitude 1.5.9 → 1.5.10

package/.github/workflows/issue_close_question.yml

@@ -0,0 +1,25 @@
+name: Close need info
+
+on:
+  schedule:
+    - cron: "0 0 */1 * *"
+  workflow_dispatch:
+
+jobs:
+  close-need-info:
+    runs-on: ubuntu-latest
+    steps:
+      - name: close-issues
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "close-issues"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: "question"
+          inactive-day: 60
+          close-reason: "not_planned"
+          body: |
+            Hi there! This issue has been automatically closed because it has not had any activity for 60 days. We label issues as "questions" in hopes of community or maintainer input, and it seems this issue has gone stale.
+          
+            If you still need assistance or believe this closure is a mistake, please feel free to reopen the issue or create a new one with updated details. We're here to help!
+          
+            Thank you for your contributions to our project!

package/.github/workflows/issue_invalid.yml

@@ -0,0 +1,18 @@
+name: Issue Invalid
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  lock-issue:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'invalid'
+    steps:
+      - name: Lock issue
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: "lock-issue"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          lock-reason: "off-topic"

package/.github/workflows/issue_question.yml

@@ -0,0 +1,30 @@
+name: Issue Question
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  create-comment:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'question'
+    steps:
+      - name: Create comment
+        uses: actions-cool/issues-helper@v2.0.0
+        with:
+          actions: "create-comment"
+          token: ${{ secrets.ISSUSE_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hello! 👋
+            
+            Thank you for submitting your question. To ensure we can provide the best answer possible, could you please confirm you've provided the following details:
+            - A clear and concise description of your question.
+            - Any relevant code snippets or links to your project.
+            - What you've tried so far in attempting to solve your issue.
+            
+            In the meantime, you might find the answer to your question in our [FAQs](https://solitude-docs.efu.me/faq) or [documentation](https://solitude-docs.efu.me/).
+            
+            We aim to respond to questions within 48 hours. If your question is urgent, please consider reaching out through our support channels.
+            
+            Thanks again for reaching out, and we look forward to assisting you!

package/.github/workflows/issue_wontfix.yml

@@ -0,0 +1,29 @@
+name: Issue Wontfix
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  handle-wontfix:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'wontfix'
+    steps:
+      - name: Create comment for wontfix
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "create-comment"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hi there! This issue has been marked as 'wontfix'. It means we've reviewed the issue but have chosen not to pursue it for reasons that may vary (e.g., aligning with the project's current priorities, outside of project scope, etc.).
+
+            We understand this might not be the outcome you were hoping for. If you believe this decision should be reconsidered, please provide any additional context or reasoning that was not previously considered.
+
+            Thank you for your understanding and for contributing to the project. Your efforts are greatly appreciated!
+      - name: Close issue after wontfix
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "close-issue"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}

package/_config.yml

@@ -585,13 +585,11 @@ loading:
 
 #代码高亮增强
 # code highlight
-hightlight:
-  enable: false
-  # 代码块行高限制
-  # Code block line height limit
-  hightlimit: 200
+highlight:
+  enable: true
+  limit: 200 # 代码行高限制 / Code line limit
   copy: true # 是否开启复制按钮 / Whether to enable the copy button
-  expand: false # 是否默认展开 / Whether to expand by default
+  expand: true # 是否默认展开 / Whether to expand by default
   # 代码块样式
   # Code block style
   theme: default # default: 默认 / mac : apple terminal

package/layout/includes/head/config.pug

@@ -44,11 +44,12 @@ script.
             enable: !{theme.lazyload.enable},
             error: '!{theme.lazyload.errorimg}'
         },
-        hightlight: {
-            enable: !{theme.hightlight.enable},
-            limit: !{theme.hightlight.hightlimit},
-            expand: !{theme.hightlight.expand},
-            copy: !{theme.hightlight.copy},
+        highlight: {
+            enable: !{theme.highlight.enable},
+            limit: !{theme.highlight.limit},
+            expand: !{theme.highlight.expand},
+            copy: !{theme.highlight.copy},
+            syntax: '!{config.syntax_highlighter}'
         },
         randomlinks: !{theme.footer.randomlink},
         lang: {

package/layout/includes/inject/head.pug

@@ -78,7 +78,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.9",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.10",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"

package/layout/includes/page/says.pug

@@ -31,7 +31,7 @@ if theme.says.enable
                                 if item.video.player
                                     video(src=item.video.player controls="controls" style="object-fit: cover;")
                                 if item.video.bilibili
-                                    iframe(src='//player.bilibili.com/player.html?auto-play=0&bvid=' + item.video.bilibili scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true")
+                                    iframe(src='//player.bilibili.com/player.html?autoplay=0&bvid=' + item.video.bilibili scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true")
 
                         if theme.says.style === 1
                             hr
@@ -51,4 +51,4 @@ if theme.says.enable
                 if theme.says.strip === -1
                     | - 已展开所有短文 -
                 else
-                    | - 只展示最近 #{theme.says.strip} 条短文 -
+                    | - 只展示最近 #{theme.says.strip} 条短文 -

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.5.9",
+  "version": "1.5.10",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the wleelw",
   "main": "package.json",
   "scripts": {

package/plugins.yml

@@ -51,7 +51,7 @@ aplayer_js:
   version: 1.10.1
 meting_js:
   name: meting
-  file: Meting.min.js
+  file: dist/Meting.min.js
   version: 2.0.1
 pace_js:
   name: pace-js

package/scripts/event/cdn.js

@@ -120,8 +120,7 @@ hexo.extend.filter.register('before_generate', () => {
                 jsdelivr: `https://cdn.jsdelivr.net/npm/${name}${verType}/${min_file}`,
                 unpkg: `https://unpkg.com/${name}${verType}/${file}`,
                 cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
-                custom: (CDN.custom_format || '').replace(/\$\{(.+?)\}/g, (match, $1) => value[$1]),
-                cdncbd: `https://cdn.cbd.int/${name}${verType}/${file}`,
+                custom: (CDN.custom_format || '').replace(/\$\{(.+?)}/g, (match, $1) => value[$1]),
             }
 
             data[key] = cdnSource[type]

package/scripts/event/init.js

@@ -10,13 +10,8 @@ hexo.extend.filter.register('before_generate', () => {
         process.exit(-1);
     }
 
-    if (config.prismjs.enable) {
-        logger.error('主题尚未支持 prismjs 请使用 highlightjs ！');
-        process.exit(-1);
-    }
-
     if (Number(majorVer) < 14) {
         logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！');
         process.exit(-1);
     }
-});
+});

package/scripts/filter/default.js

@@ -1,24 +1,23 @@
 'use strict';
 
 hexo.extend.filter.register('after_post_render', function (data) {
-    const config = hexo.theme.config
-    data.title = data.title || '无标题';
+    data.title = data.title || 'Untitled';
+    const { config } = hexo.theme;
     if (data.layout === 'post') {
-        data.locate = data.locate || config.post.default.locate
-        data.cc = data.cc || config.post.default.copyright
-        data.cover = data.cover || config.post.default.cover[getRandomInt(0, config.post.default.cover.length)] || '/img/default.png'
+        const { copyright, locate,cover } = hexo.theme.config.post.default
+        data.locate = data.locate || locate
+        data.cc = data.cc || copyright
+        data.cover = data.cover || cover ? cover[getRandomInt(0, cover?.length)] : '/img/default.png'
         data.excerpt = data.description || data.excerpt
-        if (config.aside.toc.post && data.toc !== false) data.toc = true
-        else data.toc = false
+        data.toc = !!(config.aside.toc.post && data.toc !== false);
     }
     if (data.layout === 'page') {
-        data.cover = data.cover || config.page.default.cover[getRandomInt(0, config.post.default.cover.length)] || '/img/default.png'
+        const { cover } = hexo.theme.config.page.default
+        data.cover = data.cover || cover ? cover[getRandomInt(0, cover?.length)] :'/img/default.png'
         data.excerpt = data.title
-        if (config.aside.toc.page && data.toc !== false && data.aside) data.toc = true
-        else data.toc = false
+        data.toc = !!(config.aside.toc.page && data.toc !== false && data.aside);
     }
-    if (config.comment.enable && data.comment !== false) data.comment = true
-    else data.comment = false
+    data.comment = !!(config.comment.enable && data.comment !== false);
     return data;
 });
 

package/scripts/filter/lazyload.js

@@ -1,5 +1,3 @@
-const urlFor = require('hexo-util').url_for.bind(hexo)
-
 hexo.extend.filter.register('after_render:html', function (data) {
     if (!hexo.theme.config.lazyload.enable) return
     return data.replace(

package/scripts/filter/randomPosts.js

@@ -1,8 +1,5 @@
 hexo.extend.filter.register('after_render:html', function (data) {
-    const posts = []
-    hexo.locals.get('posts').map(function (post) {
-      if (post.random !== false) posts.push(post.path)
-    })
-    data += `<script>const posts=${JSON.stringify(posts)};function toRandomPost(){ pjax.loadUrl('/'+posts[Math.floor(Math.random()*posts.length)]); };</script>`
-    return data
-})
+    const posts = hexo.locals.get('posts').filter(post => post.random !== false).map(post => post.path);
+    data += `<script>const posts=${JSON.stringify(posts)};function toRandomPost(){ pjax.loadUrl('/'+posts[Math.floor(Math.random()*posts.length)]); };</script>`;
+    return data;
+});

package/scripts/helper/stylus.js

@@ -23,6 +23,22 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     style.define('about', data && data.about ? Object.keys(data.about) : []);
 
     initGroupColor(theme.config.hometop.group,style);
+
+    // hightlight
+    const { syntax_highlighter: syntaxHighlighter, highlight, prismjs } = hexo.config
+    let { enable: highlightEnable, line_number: highlightLineNumber } = highlight
+    let { enable: prismjsEnable, line_number: prismjsLineNumber } = prismjs
+
+    // for hexo > 7.0
+    if (syntaxHighlighter) {
+        highlightEnable = syntaxHighlighter === 'highlight.js'
+        prismjsEnable = syntaxHighlighter === 'prismjs'
+    }
+
+    style.define('$highlight_enable', highlightEnable)
+    style.define('$highlight_line_number', highlightLineNumber)
+    style.define('$prismjs_enable', prismjsEnable)
+    style.define('$prismjs_line_number', prismjsLineNumber)
 });
 
 function initGroupColor(gg,style) {

package/scripts/tags/bvideo.js

@@ -1,7 +1,7 @@
 'use strict'
 
 function bilibili(args) {
-  return `<iframe class="bvideo" width="100%" height="600" src="//player.bilibili.com/player.html?aid=1351697032&bvid=${args}&p=1" border="0" frameBorder="no" framespacing="0" allowFullScreen="true"></iframe>`
+  return `<iframe class="bvideo" width="100%" height="600" src="//player.bilibili.com/player.html?autoplay=0&bvid=${args}" border="0" frameBorder="no" framespacing="0" allowFullScreen="true"></iframe>`
 }
 
-hexo.extend.tag.register('bvideo', bilibili, {ends: false})
+hexo.extend.tag.register('bvideo', bilibili, {ends: false})

package/source/css/_global/var.styl

@@ -22,4 +22,7 @@ else if hexo-config('hightlight.theme') == 'mac'
   $hl_bg_light = #FFFFFF
   $hltools_bg_light = #E7E7E7
   $hl_bg_dark = #1C1E1E
-  $hltools_bg_dark = #2A282A
+  $hltools_bg_dark = #2A282A
+
+// code
+$line-height-code-block = 1.6

package/source/css/_highlight/highlight/index.styl

@@ -0,0 +1,45 @@
+@import "diff"
+figure
+  pre
+    margin 0
+    padding 8px 0
+    border none
+  table
+    display block
+    border none
+    overflow-y hidden
+    overflow-x auto
+
+    td
+      padding 0
+      border none
+      height 100%
+
+      &.gutter
+        opacity .6
+        user-select none
+
+        pre
+          overflow auto
+          line-height 1.6
+          margin 0
+          padding 8px .5rem
+          border none
+          color var(--efu-secondtext)
+          background var(--efu-secondbg)
+          border-right var(--style-border-always)
+          text-align right
+
+      &.code
+        width 100%
+        display flex
+        position relative
+
+        pre
+          padding-right .5rem
+          padding-left .5rem
+          width 100%
+
+  .line
+    &.marked
+      background-color: rgba(97, 97, 97, .314)

package/source/css/{_widgets/_post/_highlight → _highlight}/index.styl

@@ -1,3 +1,13 @@
+@import "color"
+
+@import "theme/" + hexo-config('highlight.theme')
+
+if $highlight_enable
+  @require "highlight/index.styl"
+
+if $prismjs_enable
+  @require "prismjs/index.styl"
+
 figure
   &:hover
     box-shadow var(--efu-shadow-border-hover)
@@ -25,11 +35,6 @@ figure
     padding 0
     line-height 1.6
 
-    pre
-      margin 0
-      padding 8px 0
-      border none
-
     .highlight-tools
       position relative
       display flex
@@ -43,6 +48,13 @@ figure
       border-bottom var(--style-border-always)
       color var(--efu-fontcolor)
 
+      &.closed
+        .expand
+          transition all .3s ease 0s
+
+        & ~ *
+          display none
+
       .st-copy-fill
         position absolute
         cursor pointer
@@ -58,9 +70,6 @@ figure
         cursor pointer
         transition transform .3s ease 0s
 
-        &.closed
-          transition all .3s ease 0s
-
       .code-lang
         text-transform capitalize
         position absolute
@@ -97,47 +106,11 @@ figure
         i
           color var(--efu-white)
 
-    table
-      display block
-      border none
-      overflow-y hidden
-      overflow-x auto
-
-      td
-        padding 0
-        border none
-        height 100%
-
-        &.gutter
-          opacity .6
-          user-select none
-
-          pre
-            overflow auto
-            line-height 1.6
-            margin 0
-            padding 8px .5rem
-            border none
-            color var(--efu-secondtext)
-            background var(--efu-secondbg)
-            border-right var(--style-border-always)
-            text-align right
-
-        &.code
-          width 100%
-          display flex
-          position relative
-
-          pre
-            padding-right .5rem
-            padding-left .5rem
-            width 100%
-
-    .line
-      &.marked
-        background-color: rgba(97, 97, 97, .314)
-
-@import "theme"
-@import "diff"
-
-@import "theme/" + hexo-config('hightlight.theme')
+      &.expand-done
+        display none
+
+      &:not(.expand-done)
+        & ~ table,
+        & ~ pre
+          overflow: hidden
+          height: unit(hexo-config('highlight.limit'), px)

package/source/css/_highlight/prismjs/diff.styl

@@ -0,0 +1,184 @@
+if hexo-config('hightlight.color') == 'default'
+  pre[class*='language-']
+    .token.function
+      color: #ffb62c
+
+    .token.comment,
+    .token.prolog,
+    .token.doctype,
+    .token.cdata
+      color: rgba(149, 165, 166, .8)
+
+    .token.punctuation
+      color: #5e6687
+
+    .token.namespace
+      opacity: .7
+
+    .token.operator,
+    .token.boolean,
+    .token.number
+      color: #c76b29
+
+    .token.property
+      color: #c08b30
+
+    .token.tag
+      color: #3d8fd1
+
+    .token.string
+      color: #22a2c9
+
+    .token.selector
+      color: #6679cc
+
+    .token.attr-name
+      color: #c76b29
+
+    .token.entity,
+    .token.url,
+    .language-css .token.string,
+    .style .token.string
+      color: #22a2c9
+
+    .token.attr-value,
+    .token.keyword,
+    .token.control,
+    .token.directive,
+    .token.unit
+      color: #ac9739
+
+    .token.statement,
+    .token.regex,
+    .token.atrule
+      color: #22a2c9
+
+    .token.placeholder,
+    .token.variable
+      color: #3d8fd1
+
+    .token.deleted
+      text-decoration: line-through
+
+    .token.inserted
+      border-bottom: 1px dotted #202746
+      text-decoration: none
+
+    .token.italic
+      font-style: italic
+
+    .token.important,
+    .token.bold
+      font-weight: bold
+
+    .token.important
+      color: #c94922
+
+    .token.entity
+      cursor: help
+
+    pre > code.highlight
+      outline: .4em solid #c94922
+      outline-offset: .4em
+
+if hexo-config('hightlight.color') == 'vscode'
+    pre[class*='language-']
+      .token.comment
+        color #6a737d
+
+      .token.prolog
+        color #6a737d
+
+      .token.doctype
+        color #6a737d
+
+      .token.cdata
+        color #6a737d
+
+      .token.punctuation
+        color #d4d4d4
+
+      .token.namespace
+        opacity .7
+
+      .token.operator
+        color #d4d4d4
+
+      .token.boolean
+        color #4ec9b0
+
+      .token.number
+        color #4ec9b0
+
+      .token.property
+        color #c08b30
+
+      .token.tag
+        color #3d8fd1
+
+      .token.string
+        color #4ec9b0
+
+      .token.selector
+        color #6679cc
+
+      .token.attr-name
+        color #c76b29
+
+      .token.entity
+        color #c76b29
+
+      .token.url
+        color #22a2c9
+
+      .token.attr-value
+        color #4ec9b0
+
+      .token.keyword
+        color #c94922
+
+      .token.control
+        color #c94922
+
+      .token.directive
+        color #c94922
+
+      .token.unit
+        color #c94922
+
+      .token.statement
+        color #c94922
+
+      .token.regex
+        color #22a2c9
+
+      .token.atrule
+        color #22a2c9
+
+      .token.placeholder
+        color #3d8fd1
+
+      .token.variable
+        color #3d8fd1
+
+      .token.deleted
+        color #c94922
+
+      .token.inserted
+        color #4ec9b0
+
+      .token.italic
+        font-style italic
+
+      .token.important
+        font-weight bold
+
+      .token.important
+        color #c94922
+
+      .token.entity
+        cursor help
+
+      pre > code.highlight
+        outline .4em solid #c94922
+        outline-offset .4em

package/source/css/_highlight/prismjs/index.styl

@@ -0,0 +1,13 @@
+@require line-number
+
+@require diff
+
+#article-container
+  pre[class*='language-']
+    scrollbar-color var(--hlscrollbar-bg) transparent
+
+    &::-webkit-scrollbar-thumb
+      background var(--hlscrollbar-bg)
+
+    &:not(.line-numbers)
+      padding 10px 20px

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

@@ -0,0 +1,30 @@
+#article-container
+  pre[class*='language-']
+    &.line-numbers
+      position relative
+      margin 0
+      overflow-x auto
+
+      > code
+        display block
+        position relative
+        padding 8px 0 8px 45px
+
+      .line-numbers-rows
+        position absolute
+        top 0
+        left 0
+        color var(--efu-secondtext)
+        background var(--efu-hltools-bg)
+        border-right var(--style-border-always)
+        padding 8px 0
+
+        & > span
+          display block
+          counter-increment linenumber
+          pointer-events none
+          text-align center
+
+          &:before
+            padding 0 0.5em
+            content counter(linenumber)

package/source/css/{_widgets/_post/_highlight → _highlight}/theme/default.styl

@@ -4,9 +4,11 @@ figure
       .st-copy-fill
         right .7rem
 
+      &.closed
+        .expand
+          transform rotate(-90deg)
+
     .expand
       & + .code-lang
         left 1.7rem
 
-      &.closed
-        transform rotate(-90deg)

package/source/css/{_widgets/_post/_highlight → _highlight}/theme/mac.styl

@@ -21,5 +21,6 @@ figure
         & + .code-lang
           left 75px
 
-        &.closed
+      &.closed
+        .expand
           transform rotate(90deg)

package/source/css/_page/index.styl

@@ -31,4 +31,7 @@ if hexo-config('music.enable')
 @import "share.styl"
 
 if hexo-config('google_adsense.enable')
-  @import "google.styl"
+  @import "google.styl"
+
+if hexo-config('message.enable')
+  @import "message/index.styl"

package/source/css/_widgets/_post/content.styl

@@ -63,7 +63,7 @@
     img
       margin auto
 
-  code
+  code:not([class*='language-'])
     color var(--efu-white)
     padding 0.2rem 0.4rem
     border-radius 4px

package/source/css/_widgets/_post/index.styl

@@ -14,7 +14,5 @@ if hexo-config('comment.commentBarrage')
 
 @import "pagination"
 
-@import "_highlight/index"
-
 if hexo-config('post_ai.enable')
   @import "postAI"

package/source/css/index.styl

@@ -11,4 +11,7 @@ if hexo-config('css_prefix')
 // widgets
 @import '_widgets/index.styl'
 
-@import '_mode/*'
+@import '_mode/*'
+
+// highlight
+@import '_highlight/index'

package/source/js/main.js

@@ -658,72 +658,103 @@ let sco = {
     },
 }
 
-class hightlight {
-    static createEle(langEl, item) {
+const AddHighLightTool = () => {
+    const highlight = GLOBAL_CONFIG.highlight;
+    if (!highlight) return;
+
+    const {copy, expand, limit, syntax} = highlight;
+    const $isPrismjs = syntax === 'prismjs';
+    const $isShowTool = highlight.enable || copy || expand || limit;
+    const expandClass = !expand === true ? 'closed' : ''
+    const $syntaxHighlight = syntax === 'highlight.js' ? document.querySelectorAll('figure.highlight') : document.querySelectorAll('pre[class*="language-"]')
+
+    if (!(($isShowTool || limit) && $syntaxHighlight.length)) return
+
+    const copyEle = copy ? `<i class="solitude st-copy-fill copy-button"></i>` : '<i></i>';
+    const expandEle = `<i class="solitude st-arrow-down expand"></i>`;
+    const limitEle = limit ? `<i class="solitude st-show-line"></i>` : '<i></i>';
+
+    const alertInfo = (ele, text) => {
+        utils.snackbarShow(text, false, 2000);
+    }
+
+    const copyCode = (e) => {
+        if (document.queryCommandSupported && document.queryCommandSupported('copy')) {
+            document.execCommand('copy')
+            alertInfo(e, GLOBAL_CONFIG.lang.copy.success)
+        } else {
+            alertInfo(e, GLOBAL_CONFIG.lang.copy.error)
+        }
+    }
+
+    const copyFn = (e) => {
+        const $buttonParent = e.parentNode
+        $buttonParent.classList.add('copy-true')
+        const selection = window.getSelection()
+        const range = document.createRange()
+        const preCodeSelector = $isPrismjs ? 'pre code' : 'table .code pre'
+        range.selectNodeContents($buttonParent.querySelectorAll(`${preCodeSelector}`)[0])
+        selection.removeAllRanges()
+        selection.addRange(range)
+        copyCode(e.lastChild)
+        selection.removeAllRanges()
+        $buttonParent.classList.remove('copy-true')
+    }
+
+    const expandClose = (e) => {
+        e.classList.toggle('closed')
+    }
+
+    const shrinkEle = function () {
+        this.classList.toggle('expand-done')
+    }
+
+    const ToolsFn = function (e) {
+        const $target = e.target.classList
+        if ($target.contains('expand')) expandClose(this)
+        else if ($target.contains('copy-button')) copyFn(this)
+    }
+
+    const createEle = (lang, item, service) => {
         const fragment = document.createDocumentFragment()
-        const highlightCopyEle = GLOBAL_CONFIG.hightlight.copy ? '<i class="solitude st-copy-fill"></i>' : '<i></i>'
-        const highlightExpandEle = '<i class="solitude st-arrow-down expand"></i>'
-
-        const hlTools = document.createElement('div')
-        hlTools.className = `highlight-tools`
-        hlTools.innerHTML = highlightExpandEle + langEl + highlightCopyEle
-        let expand = GLOBAL_CONFIG.hightlight.expand
-        hlTools.children[0].addEventListener('click', (e) => {
-            if (expand) {
-                hlTools.children[0].classList.add('closed')
-                $table.setAttribute('style', 'display:none')
-                if ($expand.length !== 0) {
-                    $expand[0].setAttribute('style', 'display:none')
-                }
-            } else {
-                hlTools.children[0].classList.remove('closed')
-                $table.setAttribute('style', 'display:block')
-                if ($expand.length !== 0) {
-                    $expand[0].setAttribute('style', 'display:block')
-                }
-                if (GLOBAL_CONFIG.hightlight.limit && itemHeight > GLOBAL_CONFIG.hightlight.limit) {
-                    $table.setAttribute('style', `height: ${GLOBAL_CONFIG.hightlight.limit}px`)
-                } else {
-                    $table.setAttribute('style', `height: auto`)
-                }
-            }
-            expand = !expand
-        })
-        hlTools.children[2].addEventListener('click', (e) => {
-            utils.copy($table.querySelector('.code').innerText)
-        })
-        const ele = document.createElement('div')
-        fragment.appendChild(hlTools)
-        const itemHeight = item.clientHeight, $table = item.querySelector('table'),
-            $expand = item.getElementsByClassName('code-expand-btn')
-        if (GLOBAL_CONFIG.hightlight.limit && itemHeight > GLOBAL_CONFIG.hightlight.limit) {
-            $table.setAttribute('style', `height: ${GLOBAL_CONFIG.hightlight.limit}px`)
+
+        if ($isShowTool) {
+            const hlTools = document.createElement('div')
+            hlTools.className = `highlight-tools ${expandClass}`
+            hlTools.innerHTML = expandEle + lang + copyEle
+            utils.addEventListenerPjax(hlTools, 'click', ToolsFn)
+            fragment.appendChild(hlTools)
+        }
+
+        if (limit && item.offsetHeight > limit + 30) {
+
+            const ele = document.createElement('div')
             ele.className = 'code-expand-btn'
-            ele.innerHTML = '<i class="solitude st-show-line"></i>'
-            ele.addEventListener('click', (e) => {
-                $table.setAttribute('style', `height: ${itemHeight}px`)
-                e.target.classList.add('expand-done')
-                e.target.setAttribute('style', 'display:none')
-            })
+            ele.innerHTML = limitEle
+            utils.addEventListenerPjax(ele, 'click', shrinkEle)
             fragment.appendChild(ele)
         }
-        item.insertBefore(fragment, item.firstChild)
-        if (!expand) {
-            hlTools.children[0].classList.add('closed')
-            $table.setAttribute('style', 'display:none')
-            if ($expand.length !== 0) {
-                $expand[0].setAttribute('style', 'display:none')
-            }
+
+        if (service === 'hl') {
+            item.insertBefore(fragment, item.firstChild)
+        } else {
+            item.parentNode.insertBefore(fragment, item)
         }
     }
 
-    static init() {
-        const $figureHighlight = document.querySelectorAll('figure.highlight'), that = this
-        $figureHighlight.forEach(function (item) {
+    if ($isPrismjs) {
+        $syntaxHighlight.forEach(item => {
+            const langName = item.getAttribute('data-language') || 'Code'
+            const highlightLangEle = `<div class="code-lang">${langName}</div>`
+            utils.wrap(item, 'figure', {class: 'highlight'})
+            createEle(highlightLangEle, item)
+        })
+    } else {
+        $syntaxHighlight.forEach(item => {
             let langName = item.getAttribute('class').split(' ')[1]
-            if (langName === 'plaintext' || langName === undefined) langName = 'Code'
-            const highlightLangEle = `<div class="code-lang">${langName.toUpperCase()}</div>`
-            that.createEle(highlightLangEle, item)
+            if (langName === 'plain' || langName === undefined) langName = 'Code'
+            const highlightLangEle = `<div class="code-lang">${langName}</div>`
+            createEle(highlightLangEle, item, 'hl')
         })
     }
 }
@@ -785,7 +816,7 @@ window.refreshFn = () => {
     GLOBAL_CONFIG.randomlinks && randomLinksList()
     PAGE_CONFIG.comment && initComment()
     PAGE_CONFIG.toc && toc.init();
-    (PAGE_CONFIG.is_post || PAGE_CONFIG.is_page) && ((GLOBAL_CONFIG.hightlight.enable && hightlight.init()) || tabs.init())
+    (PAGE_CONFIG.is_post || PAGE_CONFIG.is_page) && ((AddHighLightTool()) || tabs.init())
     PAGE_CONFIG.is_home && showTodayCard()
     GLOBAL_CONFIG.covercolor.enable && coverColor()
     sco.initConsoleState()

package/source/js/utils.js

@@ -136,12 +136,11 @@ const utils = {
     },
     isMobile: () => /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),
     isHidden: e => 0 === e.offsetHeight && 0 === e.offsetWidth,
-    addEventListenerPjax: function (element, eventType, callback, useCapture = false) {
-        if (element == null) return
-        element.addEventListener(eventType, callback, useCapture);
-        utils.addGlobalFn("pjax", function () {
-            element.removeEventListener(eventType, callback, useCapture);
-        });
+    addEventListenerPjax: (ele, event, fn, option = false) => {
+        ele.addEventListener(event, fn, option)
+        utils.addGlobalFn('pjax', () => {
+            ele.removeEventListener(event, fn, option)
+        })
     },
     addGlobalFn: (key, fn, name = false, parent = window) => {
         const globalFn = parent.globalFn || {}