Merge branch 'dev' of https://github.com/jerryc127/hexo-theme-butterfly into dev

🐛 修復導航側邊欄沒有進入特效的Bugs

_config.yml

@@ -252,7 +252,7 @@ comments:
   # - Disqus
   text: true # Display the comment name next to the button
   # lazyload: The comment system will be load when comment element enters the browser's viewport.
-  # If you set it to true, the comment count will be invalid
+  # If you set it to false, the comment count will be invalid
   lazyload: false
   count: false # Display comment count in top_img
 

layout/includes/head/config.pug

@@ -88,6 +88,7 @@
 script.
   var GLOBAL_CONFIG = { 
     root: '!{config.root}',
+    hexoversion: '!{get_hexo_version()}',
     algolia: !{algolia},
     localSearch: !{localSearch},
     translate: !{translate},

layout/includes/third-party/pjax.pug

@@ -1,8 +1,6 @@
 script(src=url_for(theme.CDN.pjax))
 script.
-  var pjax = new Pjax({
-    elements: 'a:not([target="_blank"])',
-    selectors: [
+  let pjaxSelectors = [
     'title',
     'meta[name=description]',
     '#config_change',
@@ -10,7 +8,15 @@ script.
     '#rightside-config-hide',
     '#rightside-config-show',
     '.js-pjax'
-    ],
+  ]
+
+  if (!{theme.Open_Graph_meta && theme.comments.use && theme.comments.use.includes('Livere')}) {
+    pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
+  }
+
+  const pjax = new Pjax({
+    elements: 'a:not([target="_blank"])',
+    selectors: pjaxSelectors,
     cacheBust: false,
   })
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {

scripts/helpers/page.js

@@ -61,3 +61,7 @@ hexo.extend.helper.register('urlNoIndex', function () {
 hexo.extend.helper.register('md5', function (path) {
   return crypto.createHash('md5').update(decodeURI(this.url_for(path))).digest('hex')
 })
+
+hexo.extend.helper.register('get_hexo_version', function () {
+  return hexo.version
+})

source/js/main.js

@@ -465,6 +465,7 @@ const tocFn = function () {
   // DOM Hierarchy:
   // ol.toc > (li.toc-item, ...)
   // li.toc-item > (a.toc-link, ol.toc-2child > (li.toc-item, ...))
+  const versionBiggerFive = GLOBAL_CONFIG.hexoversion.split('.')[0] >= 5
   const findHeadPosition = function (top) {
     // assume that we are not in the post page if no TOC link be found,
     // thus no need to update the status
@@ -477,7 +478,8 @@ const tocFn = function () {
     list.each(function () {
       const head = $(this)
       if (top > head.offset().top - 25) {
-        currentId = '#' + encodeURI($(this).attr('id'))
+        if (versionBiggerFive) currentId = '#' + encodeURI($(this).attr('id'))
+        else currentId = '#' + $(this).attr('id')
       }
     })