fix: 修復開啟gitalk評論數後與toc衝突的bug close #462

fix: 修復jquery在一些介面仍然載入問題
fix: 修復medium zoom 報錯的 bug

layout/includes/header/post-info.pug

@@ -77,7 +77,7 @@
         else if whichCount === 'Gitalk'
           +countBlock
             a(href=url_for(page.path) + '#post-comment')
-              span.gitalk-#card-toc
+              span.gitalk-comment-count
         else if whichCount === 'Twikoo'
           +countBlock
             a(href=url_for(page.path) + '#post-comment')

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

@@ -23,11 +23,11 @@ script.
     const loadTwikoo = (bool = false) => {
       if (typeof twikoo === 'object') {
         init()
-        bool && $countDom && setTimeout(()=>{getCount()},0)
+        bool && $countDom && setTimeout(getCount,0)
       } else {
         getScript('!{theme.CDN.twikoo}').then(()=> {
           init()
-          bool && $countDom && setTimeout(()=>{getCount()},0)
+          bool && $countDom && setTimeout(getCount,0)
         })
       }
     }

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

@@ -41,7 +41,7 @@ script.
 
   if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
     if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#vcomment'),loadValine)
-    else setTimeout(() => loadValine(), 0)
+    else setTimeout(loadValine, 0)
   } else {
     function loadOtherComment () {
       loadValine()

package.json

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

source/js/main.js

@@ -247,40 +247,38 @@ document.addEventListener('DOMContentLoaded', function () {
  * fancybox和 mediumZoom
  */
   const addFancybox = function (ele) {
-    if (ele.length) {
+    const runFancybox = (ele) => {
-      const runFancybox = (ele) => {
+      ele.each(function (i, o) {
-        ele.each(function (i, o) {
+        const $this = $(o)
-          const $this = $(o)
+        const lazyloadSrc = $this.attr('data-lazy-src') || $this.attr('src')
-          const lazyloadSrc = $this.attr('data-lazy-src') || $this.attr('src')
+        const dataCaption = $this.attr('alt') || ''
-          const dataCaption = $this.attr('alt') || ''
+        $this.wrap(`<a href="${lazyloadSrc}" data-fancybox="group" data-caption="${dataCaption}" class="fancybox"></a>`)
-          $this.wrap(`<a href="${lazyloadSrc}" data-fancybox="group" data-caption="${dataCaption}" class="fancybox"></a>`)
+      })
-        })
 
-        $().fancybox({
+      $().fancybox({
-          selector: '[data-fancybox]',
+        selector: '[data-fancybox]',
-          loop: true,
+        loop: true,
-          transitionEffect: 'slide',
+        transitionEffect: 'slide',
-          protect: true,
+        protect: true,
-          buttons: ['slideShow', 'fullScreen', 'thumbs', 'close'],
+        buttons: ['slideShow', 'fullScreen', 'thumbs', 'close'],
-          hash: false
+        hash: false
-        })
+      })
-      }
+    }
 
-      if (typeof $.fancybox === 'undefined') {
+    if (typeof $.fancybox === 'undefined') {
-        $('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`)
+      $('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`)
-        $.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () {
+      $.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () {
-          runFancybox($(ele))
-        })
-      } else {
         runFancybox($(ele))
-      }
+      })
+    } else {
+      runFancybox($(ele))
     }
   }
 
   const addMediumZoom = () => {
     const zoom = mediumZoom(document.querySelectorAll('#article-container :not(a)>img'))
     zoom.on('open', e => {
-      const photoBg = $(document.documentElement).attr('data-theme') === 'dark' ? '#121212' : '#fff'
+      const photoBg = document.documentElement.getAttribute('data-theme') === 'dark' ? '#121212' : '#fff'
       zoom.update({
         background: photoBg
       })
@@ -288,15 +286,17 @@ document.addEventListener('DOMContentLoaded', function () {
   }
 
   const jqLoadAndRun = () => {
-    const isFancybox = GLOBAL_CONFIG.lightbox === 'fancybox'
+    const $fancyboxEle = GLOBAL_CONFIG.lightbox === 'fancybox'
-    const $fancyboxEle = isFancybox ? document.querySelectorAll('#article-container :not(a):not(.gallery-group) > img, #article-container > img') : null
+      ? document.querySelectorAll('#article-container :not(a):not(.gallery-group) > img, #article-container > img')
+      : []
+    const fbLengthNoZero = $fancyboxEle.length > 0
     const $jgEle = document.querySelectorAll('#article-container .justified-gallery')
-    const jgEleLength = $jgEle.length
+    const jgLengthNoZero = $jgEle.length > 0
 
-    if (jgEleLength || $fancyboxEle !== null) {
+    if (jgLengthNoZero || fbLengthNoZero) {
       btf.isJqueryLoad(() => {
-        jgEleLength && runJustifiedGallery($jgEle)
+        jgLengthNoZero && runJustifiedGallery($jgEle)
-        isFancybox && addFancybox($fancyboxEle)
+        fbLengthNoZero && addFancybox($fancyboxEle)
       })
     }
   }
@@ -471,7 +471,7 @@ document.addEventListener('DOMContentLoaded', function () {
       const currentActive = $tocLink[currentIndex]
       currentActive.classList.add('active')
 
-      setTimeout(function () {
+      setTimeout(() => {
         autoScrollToc(currentActive)
       }, 0)
 
@@ -626,7 +626,7 @@ document.addEventListener('DOMContentLoaded', function () {
  */
   const addRuntime = () => {
     const $runtimeCount = document.getElementById('runtimeshow')
-    if ($runtimeCount !== null) {
+    if ($runtimeCount) {
       const publishDate = $runtimeCount.getAttribute('data-publishDate')
       $runtimeCount.innerText = btf.diffDate(publishDate) + ' ' + GLOBAL_CONFIG.runtime
     }
@@ -637,7 +637,7 @@ document.addEventListener('DOMContentLoaded', function () {
  */
   const addLastPushDate = () => {
     const $lastPushDateItem = document.getElementById('last-push-date')
-    if ($lastPushDateItem !== null) {
+    if ($lastPushDateItem) {
       const lastPushDate = $lastPushDateItem.getAttribute('data-lastPushDate')
       $lastPushDateItem.innerText = btf.diffDate(lastPushDate, true)
     }
@@ -685,7 +685,8 @@ document.addEventListener('DOMContentLoaded', function () {
 
           if (!$tabItem.classList.contains('active')) {
             const $tabContent = $tabItem.parentNode.nextElementSibling
-            btf.siblings($tabItem, '.active')[0].classList.remove('active')
+            const $siblings = btf.siblings($tabItem, '.active')[0]
+            $siblings && $siblings.classList.remove('active')
             $tabItem.classList.add('active')
             const tabId = $this.getAttribute('data-href').replace('#', '')
             const childList = [...$tabContent.children]
@@ -712,7 +713,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
   const toggleCardCategory = function () {
     const $cardCategory = document.querySelectorAll('#aside-cat-list .card-category-list-item.parent i')
-    if ($cardCategory.length > 0) {
+    if ($cardCategory.length) {
       $cardCategory.forEach(function (item) {
         item.addEventListener('click', function (e) {
           e.preventDefault()

source/js/tw_cn.js

@@ -88,8 +88,9 @@ document.addEventListener('DOMContentLoaded', function () {
     translateButtonObject = document.getElementById('translateLink')
     if (translateButtonObject) {
       if (currentEncoding !== targetEncoding) {
-        setTimeout(function () { translateBody() }, translateDelay)
+        setTimeout(translateBody, translateDelay)
-        if (targetEncoding === 1) { translateButtonObject.innerHTML = msgToSimplifiedChinese } else translateButtonObject.innerHTML = msgToTraditionalChinese
+        if (targetEncoding === 1) translateButtonObject.innerHTML = msgToSimplifiedChinese
+        else translateButtonObject.innerHTML = msgToTraditionalChinese
       }
       translateButtonObject.addEventListener('click', translatePage, false)
     }