feat: 去除 jQuery (fancybox和圖庫 仍需要加載jQuery)

feat: 點擊文字特效增加隨機配置
feat: 可配置是否添加css前綴
fix: 修復子目錄下，配置justifiedGallery CDN（相對鏈接）後，連接會無法訪問的bugs
fix: 修復 pangu 配置post 後，仍在全站生效的bugs
improvement: 夜間模式下，廣告降低亮度
improvement: 手機端toc邊距微調
improvement: html格式優化
improvement: 搜索優化
improvement: 刪除不必要的語言文件

layout/includes/third-party/artitalk.pug

@@ -1,24 +0,0 @@
-- let option = theme.artitalk.option ? JSON.stringify(theme.artitalk.option) : false
-
-script.
-  (()=>{
-    let setting = {
-      appId: '!{theme.artitalk.appId}',
-      appKey: '!{theme.artitalk.appKey}',
-    }
-
-    if (!{Boolean(option)}) {
-      const otherSetting = !{option}
-      setting = Object.assign({}, setting, otherSetting)
-    }
-
-    const init = () => {
-      new Artitalk(setting)
-    }
-
-    if (typeof Artitalk === 'function') {
-      init()
-    } else {
-      $.getScript('!{theme.CDN.artitalk}',init)
-    }
-  })()

layout/includes/third-party/baidu_push.pug

@@ -3,11 +3,11 @@ if theme.baidu_push
     (function(){
       const bp = document.createElement('script');
       const curProtocol = window.location.protocol.split(':')[0];
-      if (curProtocol === 'https'){
-      bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
+      if (curProtocol === 'https') {
+        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
       }
       else{
-      bp.src = 'http://push.zhanzhang.baidu.com/push.js';
+        bp.src = 'http://push.zhanzhang.baidu.com/push.js';
       }
       bp.dataset.pjax = ''
       const s = document.getElementsByTagName("script")[0];

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

@@ -29,7 +29,7 @@ script.
     if (window.disqusJsLoad) initDisqusjs()
     else {
       addDisqusjsCSS()
-      $.getScript('!{url_for(theme.CDN.disqusjs)}', initDisqusjs)
+      getScript('!{url_for(theme.CDN.disqusjs)}').then(initDisqusjs)
       window.disqusJsLoad = true
     }
   }

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

@@ -28,7 +28,7 @@ script.
     if (typeof Gitalk === 'function') initGitalk()
     else {
       addGitalkSource()
-      $.getScript('!{url_for(theme.CDN.gitalk)}', initGitalk)
+      getScript('!{url_for(theme.CDN.gitalk)}').then(initGitalk)
     }
   }
   

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

@@ -9,7 +9,7 @@ script.
     if (typeof twikoo.init === 'function') {
       init()
     } else {
-      $.getScript('!{theme.CDN.twikoo}', init)
+      getScript('!{theme.CDN.twikoo}').then(init)
     }
   }
 

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

@@ -36,7 +36,7 @@ script.
     }
 
     if (typeof Valine === 'function') initValine() 
-    else $.getScript('!{url_for(theme.CDN.valine)}', initValine)
+    else getScript('!{url_for(theme.CDN.valine)}').then(initValine)
   }
 
   if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {

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

@@ -2,6 +2,9 @@ link(rel="stylesheet" type="text/css" href=theme.CDN.katex)
 script(src=url_for(theme.CDN.katex_copytex))
 link(rel="stylesheet" type="text/css" href=theme.CDN.katex_copytex_css)
 script.
-  $(function () {
-    $('span.katex-display').wrap('<div class="katex-wrap"></div>')
-  })
+  (() => {
+    document.querySelectorAll('#article-container span.katex-display').forEach(item => {
+      btf.wrap(item, 'div', '', 'katex-wrap')
+    })
+  })()
+  

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

@@ -2,7 +2,7 @@ script.
   if (document.getElementsByClassName('mermaid').length) {
     if (window.mermaidJsLoad) mermaid.init()
     else {
-      $.getScript('!{theme.CDN.mermaid}', function () {
+      getScript('!{theme.CDN.mermaid}').then(() => {
         window.mermaidJsLoad = true
         mermaid.initialize({
           theme: '!{theme.mermaid.theme}',

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

@@ -14,24 +14,25 @@ script.
     }
 
     const getDisqusComment = () => {
-      let disqusArray = []
-      $.getJSON('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{theme.newest_comments.disqus.forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{theme.newest_comments.disqus.api_key}', function(data){
-        $.each(data.response, (i, item) => {
-          disqusArray.push({
-            'avatar': item.author.avatar.cache,
-            'content': changeContent(item.message),
-            'nick': item.author.name,
-            'url': item.url,
-            'date': item.createdAt
+      fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{theme.newest_comments.disqus.forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{theme.newest_comments.disqus.api_key}')
+        .then(response => response.json())
+        .then(data => {
+          const disqusArray = data.response.map(item => {
+            return {
+              'avatar': item.author.avatar.cache,
+              'content': changeContent(item.message),
+              'nick': item.author.name,
+              'url': item.url,
+              'date': item.createdAt
+            }
           })
+          // set expiry to 10 min
+          saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24))
+          generateHtml(disqusArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
-        // set expiry to 10 min
-        saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24))
-        generateHtml(disqusArray)
-      }).fail(()=>{
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-      })
     }
 
     const generateHtml = array => {

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

@@ -14,23 +14,24 @@ script.
     }
 
     const getGithubIssues = () => {
-      let githubArray = []
-      $.getJSON('https://api.github.com/repos/!{theme.newest_comments.github_issues.repo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1', (data) => { 
-        $.each(data, (index, item) => {
-          githubArray.push({
-            'avatar': item.user.avatar_url,
-            'content': changeContent(item.body),
-            'nick': item.user.login,
-            'url': item.html_url,
-            'date': item.updated_at
+      fetch('https://api.github.com/repos/!{theme.newest_comments.github_issues.repo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1')
+        .then(response => response.json())
+        .then(data => {
+          const githubArray = data.map(item => {
+            return {
+              'avatar': item.user.avatar_url,
+              'content': changeContent(item.body),
+              'nick': item.user.login,
+              'url': item.html_url,
+              'date': item.updated_at
+            }
           })
+          saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24))
+          generateHtml(githubArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
-        saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24))
-        generateHtml(githubArray)
-      }).fail(()=>{
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-      })
     }
 
     const generateHtml = array => {

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

@@ -51,9 +51,7 @@ script.
         }
 
       var settings = {
-        "url": `${serverURL}/1.1/classes/Comment?limit=!{theme.newest_comments.limit}&order=-createdAt`,
         "method": "GET",
-        "timeout": 0,
         "headers": {
           "X-LC-Id": '!{theme.newest_comments.leancloud.appId}',
           "X-LC-Key": '!{theme.newest_comments.leancloud.appKey}',
@@ -61,26 +59,25 @@ script.
         },
       }
 
-      $.ajax(settings).done((response) => {
-        var valineArray = []
-        response.results.forEach((e)=>{
-          valineArray.push({
-            'avatar': e.QQAvatar,
-            'content': changeContent(e.comment),
-            'mail': e.mail,
-            'nick': e.nick,
-            'url': e.url,
-            'date': e.createdAt,
+      fetch(`${serverURL}/1.1/classes/Comment?limit=!{theme.newest_comments.limit}&order=-createdAt`,settings)
+        .then(response => response.json())
+        .then(data => {
+          const valineArray = data.results.map(function (e) {
+            return {
+              'avatar': e.QQAvatar,
+              'content': changeContent(e.comment),
+              'mail': e.mail,
+              'nick': e.nick,
+              'url': e.url,
+              'date': e.createdAt,
+            }
           })
-        })
-        
-        saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
-        generateHtml(valineArray)
-
-      }).fail(()=>{
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-      })
+          saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
+          generateHtml(valineArray)
+        }).catch(e => { 
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        }) 
     }
 
     const newestCommentInit = () => {

layout/includes/third-party/pangu.pug

@@ -2,9 +2,10 @@ script.
   function panguFn () {
     if (typeof pangu === 'object') pangu.spacingElementById('content-inner')
     else {
-      $.getScript('!{url_for(theme.CDN.pangu)}', () => {
-        pangu.spacingElementById('content-inner')
-      })
+      getScript('!{url_for(theme.CDN.pangu)}')
+        .then(() => {
+          pangu.spacingElementById('content-inner')
+        })
     }
   }
 
@@ -16,4 +17,4 @@ script.
     }
   }
 
-  document.addEventListener('DOMContentLoaded', panguFn)
+  document.addEventListener('DOMContentLoaded', panguInit)

layout/includes/third-party/pjax.pug

@@ -29,8 +29,12 @@ script.
   document.addEventListener('pjax:complete', function () {
     window.refreshFn()
 
-    $('script[data-pjax]').each(function () {
-      $(this).parent().append($(this).remove())
+    document.querySelectorAll('script[data-pjax]').forEach(item => {
+      const newScript = document.createElement('script')
+      const content = item.text || item.textContent || item.innerHTML || ""
+      Array.from(item.attributes).forEach(attr => newScript.setAttribute(attr.name, attr.value))
+      newScript.appendChild(document.createTextNode(content))
+      item.parentNode.replaceChild(newScript, item)
     })
 
     GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
@@ -69,10 +73,8 @@ script.
 
     typeof typed === 'object' && typed.destroy()
 
-    $(window).off('scroll')
-
     //reset readmode
-    $('body').hasClass('read-mode') && $('body').removeClass('read-mode')
+    const $bodyClassList = document.body.classList
+    $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')
 
   })
-

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

@@ -7,18 +7,6 @@
           input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
     hr
     #local-search-results
-      #local-hits
-      #local-stats
-        #hr.local-search-stats__hr
-          case config.language
-            when "zh-CN"
-              span=_p("local_search.by")
-              |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
-              |  #[span=_p("local_search.powered")]
-            when "en"
-            default
-              span=_p("local_search.powered_by")
-              |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
     span.search-close-button
       i.fas.fa-times
   #search-mask

layout/includes/third-party/subtitle.pug

@@ -1,28 +1,34 @@
-- var source = theme.subtitle.source
+- let source = theme.subtitle.source
+
 case source
   when 1
     script.
       function subtitleType () {
-        $.getJSON('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',function (data) {
-          if (!{theme.subtitle.effect}) {
-            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-            var both = sub.unshift(data.text)
-            typed = new Typed('#subtitle', {
-              strings: sub,
-              startDelay: 300,
-              typeSpeed: 150,
-              loop: !{theme.subtitle.loop},
-              backSpeed: 50,
-            })
-          } else {
-            document.getElementById('subtitle').innerHTML = data.text
-          }
-        })
+        fetch('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json')
+          .then(response => response.json())
+          .then(data => {
+            if (!{theme.subtitle.effect}) {
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+              var both = sub.unshift(data.text)
+              typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = data.text
+            }
+          })
       }
 
       if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
       } else {
         subtitleType()
       }
@@ -30,27 +36,32 @@ case source
   when 2
     script.
       function subtitleType () {
-        $.getJSON('https://v1.hitokoto.cn', function (data) {
-          if (!{theme.subtitle.effect}) {
-            var from = '出自 ' + data.from
-            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-            var both = sub.unshift(data.hitokoto, from)
-            var typed = new Typed('#subtitle', {
-              strings: sub,
-              startDelay: 300,
-              typeSpeed: 150,
-              loop: !{theme.subtitle.loop},
-              backSpeed: 50,
-            })
-          } else {
-            document.getElementById('subtitle').innerHTML = data.hitokoto
-          }
-        })
+        fetch('https://v1.hitokoto.cn')
+          .then(response => response.json())
+          .then(data => {
+            if (!{theme.subtitle.effect}) {
+              var from = '出自 ' + data.from
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+              var both = sub.unshift(data.hitokoto, from)
+              var typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = data.hitokoto
+            }
+          })
       }
 
       if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
       } else {
         subtitleType()
       }
@@ -58,7 +69,7 @@ case source
   when 3
     script.
       function subtitleType () {
-        $.getScript('http://yijuzhan.com/api/word.php?m=js', function () {
+        getScript('http://yijuzhan.com/api/word.php?m=js').then(() => {
           var con = str[0]
           if (!{theme.subtitle.effect}) {
             var from = '出自 ' + str[1]
@@ -78,8 +89,11 @@ case source
       }
 
       if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
       } else {
         subtitleType()
       }
@@ -87,7 +101,7 @@ case source
   when 4
     script.
       function subtitleType () {
-        $.getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
+        getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js').then(() => {
           jinrishici.load(function (result) {
             if (!{theme.subtitle.effect}) {
               var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
@@ -108,8 +122,11 @@ case source
       }
 
       if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
       } else {
         subtitleType()
       }
@@ -131,8 +148,11 @@ case source
       }
 
       if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
       } else {
         subtitleType()
-      }
+      }