Merge branch 'dev' into master

更新内容請看 https://github.com/jerryc127/hexo-theme-butterfly/releases

_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 false, the comment count will be invalid
+  # If you set it to true, the comment count will be invalid
   lazyload: false
   count: false # Display comment count in top_img
 

layout/includes/head/config.pug

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

layout/includes/third-party/pjax.pug

@@ -1,22 +1,16 @@
 script(src=url_for(theme.CDN.pjax))
 script.
-  let pjaxSelectors = [
+  var pjax = new Pjax({
-    'title',
-    'meta[name=description]',
-    '#config_change',
-    '#body-wrap',
-    '#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,
+    selectors: [
+      'title',
+      'meta[name=description]',
+      '#config_change',
+      '#body-wrap',
+      '#rightside-config-hide',
+      '#rightside-config-show',
+      '.js-pjax'
+    ],
     cacheBust: false,
   })
 

package.json

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

scripts/helpers/page.js

@@ -61,7 +61,3 @@ 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/css/_global/index.styl

@@ -249,7 +249,7 @@ if hexo-config('avatar.effect') == true
 
     for i in 1 2 3 4
       > :nth-child({i})
-        animation: sidebarItem (i / 5)s
+        animation: sidebarItem (i / 5) s
 
 @keyframes scroll-down-effect
   0%

source/js/main.js

@@ -465,7 +465,6 @@ 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
@@ -478,8 +477,7 @@ const tocFn = function () {
     list.each(function () {
       const head = $(this)
       if (top > head.offset().top - 25) {
-        if (versionBiggerFive) currentId = '#' + encodeURI($(this).attr('id'))
+        currentId = '#' + encodeURI($(this).attr('id'))
-        else currentId = '#' + $(this).attr('id')
       }
     })