hexo-theme-shokax 0.5.0-dev-31f9f21 → 0.5.0-dev-4774f82

package/_config.yml

@@ -387,6 +387,14 @@ vendors:
       source: cdnjs
       url: KaTeX/0.16.9/contrib/copy-tex.min.js
       sri: "sha384-ww/583aHhxWkz5DEVn6OKtNiIaLi2iBRNZXfJRiY1Ai7tnJ9UXpEsyvOITVpTl4A"
+    fancybox:
+      source: cdnjs
+      url: fancybox/3.5.7/jquery.fancybox.min.js
+      sri: "sha384-Zm+UU4tdcfAm29vg+MTbfu//q5B/lInMbMCr4T8c9rQFyOv6PlfQYpB5wItcXWe7"
+    justifiedGallery:
+      source: cdnjs
+      url: justifiedGallery/3.8.1/js/jquery.justifiedGallery.min.js
+      sri: "sha384-TOxsBplaL96/QDWPIUg+ye3v89qSE3s22XNtJMmCeZEep3cVDmXy1zEfZvVv+y2m"
   css:
     katex:
       source: cdnjs

package/layout/_partials/head/head.pug

@@ -48,6 +48,7 @@ if fontConfig
 // 临时处理
 link(rel="stylesheet" media="none" onload="this.media='all'" href="https://s4.zstatic.net/ajax/libs/fancybox/3.5.7/jquery.fancybox.min.css")
 link(rel="stylesheet" media="none" onload="this.media='all'" href="https://s4.zstatic.net/ajax/libs/justifiedGallery/3.8.1/css/justifiedGallery.min.css")
+link(rel="stylesheet" media="none" onload="this.media='all'" href="https://s4.zstatic.net/ajax/libs/KaTeX/0.16.9/katex.min.css")
 //link(rel="stylesheet" media="none" onload="this.media='all'" href="https://s4.zstatic.net/ajax/libs/KaTeX/0.16.9/katex.min.css")
 != _css('mermaid.css')
 if theme.experiments.cloudflarePatch

package/layout/_partials/layout.pug

@@ -2,10 +2,6 @@ include ../_mixin/breadcrumb.pug
 include ../_mixin/sidebar.pug
 include ../_mixin/widgets.pug
 
-- ignores = []
-if (theme.quicklink.ignores)
-    - ignores.push(theme.quicklink.ignores)
-
 - var covers = _cover_index(page, 6)
 - var enableFixedCover = theme.homeConfig?.fixedCover
 - var enablePreload = theme.experiments?.coverConfig?.enablePreload
@@ -120,12 +116,7 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                     essay: `#{__('quiz.essay')}`,
                     gap_fill: `#{__('quiz.gap_fill')}`,
                     mistake: `#{__('quiz.mistake')}`
-                },
-                ignores: [
-                    (uri) => uri.includes('#'),
-                    (uri) => new RegExp(LOCAL.path + '$').test(uri),
-                        !{JSON.stringify(ignores)}
-                ]
+                }
             };
 
         != partial('_partials/third-party/baidu-analytics.pug', {}, {cache: true})

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.5.0-dev-31f9f21",
+    "version": "0.5.0-dev-4774f82",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -42,7 +42,6 @@
         "js-yaml": "^4.1.0",
         "katex": "^0.16.11",
         "mouse-firework": "^0.0.6",
-        "quicklink": "^2.3.0",
         "theme-shokax-anime": "^0.0.7",
         "twikoo": "^1.6.39",
         "unlazy": "^0.11.3"

package/scripts/generaters/script.js

@@ -59,10 +59,6 @@ hexo.extend.generator.register("script", function(locals) {
       enable: theme.outime.enable,
       days: theme.outime.days
     },
-    quicklink: {
-      timeout: theme.quicklink.timeout,
-      priority: theme.quicklink.priority
-    },
     playerAPI: theme.playerAPI,
     experiments: {
       copyrightLength: theme.experiments.copyrightLength

package/source/js/_app/library/declare.d.ts

@@ -109,11 +109,6 @@ interface configType {
     region: string
   }
   walinePageView: boolean
-  quicklink: {
-    ignores: any
-    timeout: number
-    priority: boolean
-  }
   playerAPI: string
   experiments: {
     copyrightLength: number;

package/source/js/_app/pjax/refresh.ts

@@ -1,9 +1,7 @@
 import { cardActive } from '../page/common'
 import { resizeHandle } from '../globals/handles'
 import {
-  CONFIG,
   setLocalHash, setLocalUrl, setOriginTitle,
-  toolPlayer
 } from '../globals/globalVars'
 import { positionInit } from '../globals/tools'
 import { menuActive, sideBarTab, sidebarTOC } from '../components/sidebar'
@@ -16,7 +14,7 @@ export const siteRefresh = async (reload) => {
   setLocalUrl(window.location.href)
 
   // @ts-ignore
-  await import('katex/dist/katex.min.css')
+  // await import('katex/dist/katex.min.css')
   await import('katex/dist/contrib/copy-tex.mjs')
 
   // 懒加载背景图
@@ -95,10 +93,15 @@ export const siteRefresh = async (reload) => {
     tabFormat()
   }
 
-  if (__shokax_player__) {
-    toolPlayer.player.load(LOCAL.audio || CONFIG.audio || {})
+  // if (__shokax_player__) {
+  //   toolPlayer.player.load(LOCAL.audio || CONFIG.audio || {})
+  // }
+  if (sessionStorage.getItem('loaded') === 'true') {
+    Loader.hide(30)
+  } else {
+    sessionStorage.setItem('loaded', 'true')
+    Loader.hide(500)
   }
-  Loader.hide(100)
 
   setTimeout(() => {
     positionInit()

package/source/js/_app/pjax/siteInit.ts

@@ -14,11 +14,6 @@ const siteInit = async () => {
   initVue()
   domInit()
 
-  CONFIG.quicklink.ignores = LOCAL.ignores
-  import('quicklink').then(({listen}) => {
-    listen(CONFIG.quicklink)
-  })
-
   autoDarkmode()
 
   if (__shokax_VL__) {
@@ -70,18 +65,11 @@ const siteInit = async () => {
     passive: true
   })
 
-  // window.addEventListener('pjax:send', pjaxReload, {
-  //   passive: true
-  // })
-
-  // window.addEventListener('pjax:success', siteRefresh, {
-  //   passive: true
-  // }) // 默认会传入一个event参数
-
   window.addEventListener('beforeunload', () => {
     pagePosition()
   })
   await siteRefresh(1)
+  // TODO 修复内页跳转后重复出现加载动画的问题
 }
 
 cloudflareInit()