hexo-theme-shokax 0.5.0-dev-815e373 → 0.5.0-dev-58aa58e

package/README.md

@@ -9,6 +9,7 @@
 - 引入新的 Inject 类技术 (长期)
 - 引入新的工作流程
 - 引入 CI 自动测试
+- 重构 player (暂时移除)
 - 优化 menu 配置格式
 - 优化和异步化 Smart Bundle 技术
 - 优化 CSS 结构和加载

package/_images.yml

@@ -1,9 +1,2 @@
 # 此images已失效,见https://github.com/theme-shoka-x/hexo-theme-shokaX/issues/6
-- 6833939bly1giciryrr3rj20zk0m8nhk.jpg
-- 6833939bly1gicis081o9j20zk0m8dmr.jpg
-- 6833939bly1gicis3attqj20zk0m8k7l.jpg
-- 6833939bly1giciszlczyj20zk0m816d.jpg
-- 6833939bly1gicit31ffoj20zk0m8naf.jpg
-- 6833939bly1gicit4jrvuj20zk0m8785.jpg
-- 6833939bly1gicitcxhpij20zk0m8hdt.jpg
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.5.0-dev-815e373",
+    "version": "0.5.0-dev-58aa58e",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",

package/source/js/_app/components/comments.ts

@@ -74,7 +74,6 @@ export const walineRecentComments = async function () {
     commentTime.className = 'breadcrumb'
     commentTime.innerText = `${item.nick} @ ${item.time}`
     commentLink.href = root + item.href
-    commentLink['data-pjax-state'] = 'data-pjax-state'
     commentEl.className = 'item'
 
     commentText.appendChild(document.createElement('br'))

package/source/js/_app/components/tcomments.ts

@@ -40,7 +40,6 @@ export const twikooRecentComments = async function () {
     commentTime.className = 'breadcrumb'
     commentTime.innerText = `${item.nick} @ ${item.time}`
     commentLink.href = root + item.href
-    commentLink['data-pjax-state'] = 'data-pjax-state'
     commentEl.className = 'item'
 
     commentText.appendChild(document.createElement('br'))

package/source/js/_app/globals/globalVars.ts

@@ -1,5 +1,3 @@
-import { $dom } from '../library/dom'
-import Pjax from 'theme-shokax-pjax'
 import initProto from '../library/proto'
 
 export const CONFIG = shokax_CONFIG
@@ -29,7 +27,6 @@ export let oWinHeight = window.innerHeight
 export let oWinWidth = window.innerWidth
 export let LOCAL_HASH = 0
 export let LOCAL_URL = window.location.href
-export let pjax:Pjax
 
 export function setSiteNavHeight (value:number):void {
   siteNavHeight = value
@@ -66,10 +63,6 @@ export function setLocalUrl (value:string):void {
   LOCAL_URL = value
 }
 
-export function setPjax (value:Pjax):void {
-  pjax = value
-}
-
 export function setOriginTitle (value:string):void {
   originTitle = value
 }

package/source/js/_app/library/loadFile.ts

@@ -1,4 +1,3 @@
-import { getScript } from './scriptPjax'
 import { CONFIG } from '../globals/globalVars'
 import { createChild } from './proto'
 
@@ -19,9 +18,7 @@ const assetUrl = (asset: string, type: string): string => {
 
 export const vendorJs = (type: string, callback?: Function, condition?: string) => {
   if (LOCAL[type]) {
-    getScript(assetUrl('js', type),CONFIG['js'][type].sri, callback || function () {
-      window[type] = true
-    }, condition || window[type])
+    assetUrl('js', type)
   }
 }
 

package/source/js/_app/page/post.ts

@@ -231,15 +231,15 @@ export const postBeauty = () => {
     element.className = ['primary', 'success', 'info', 'warning', 'danger'][Math.floor(Math.random() * 5)]
   })
 
-  if (__shokax_player__) {
-    $dom.each('.md div.player', (element) => {
-      mediaPlayer(element, {
-        type: element.getAttribute('data-type'),
-        mode: 'order',
-        btns: []
-      }).player.load(JSON.parse(element.getAttribute('data-src'))).fetch()
-    })
-  }
+  // if (__shokax_player__) {
+  //   $dom.each('.md div.player', (element) => {
+  //     mediaPlayer(element, {
+  //       type: element.getAttribute('data-type'),
+  //       mode: 'order',
+  //       btns: []
+  //     }).player.load(JSON.parse(element.getAttribute('data-src'))).fetch()
+  //   })
+  // }
 
   const angleDown = document.querySelectorAll('.show-btn .i-angle-down')
   if (angleDown.length) {

package/source/js/_app/page/search.ts

@@ -5,7 +5,7 @@ import type { HitHighlightResult } from 'instantsearch.js/es/types/results'
 import instantsearch from 'instantsearch.js'
 import { liteClient as algoliasearch } from 'algoliasearch/lite'
 
-export function algoliaSearch (pjax) {
+export function algoliaSearch () {
   const search = instantsearch({
     indexName: CONFIG.search.indexName,
     searchClient: algoliasearch(CONFIG.search.appID, CONFIG.search.apiKey),
@@ -18,10 +18,6 @@ export function algoliaSearch (pjax) {
     }
   })
 
-  search.on('render', () => {
-    pjax.refresh(document.getElementById("search-hits"))
-  })
-
   // Registering Widgets
   search.addWidgets([
     configure({
@@ -105,7 +101,7 @@ export function algoliaSearch (pjax) {
     }
   })
   document.querySelector('.close-btn').addEventListener('click', onPopupClose)
-  window.addEventListener('pjax:success', onPopupClose)
+  // window.addEventListener('pjax:success', onPopupClose)
   window.addEventListener('keyup', (event) => {
     if (event.key === 'Escape') {
       onPopupClose()

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

@@ -45,13 +45,13 @@ export default function domInit () {
   goToComment.addEventListener('click', goToCommentHandle)
   showContents.addEventListener('click', sideBarToggleHandle)
 
-  if (__shokax_player__) {
-    mediaPlayer(toolPlayer)
-
-    document.querySelector('main').addEventListener('click', () => {
-      toolPlayer.player.mini()
-    })
-  }
+  // if (__shokax_player__) {
+  //   mediaPlayer(toolPlayer)
+  //
+  //   document.querySelector('main').addEventListener('click', () => {
+  //     toolPlayer.player.mini()
+  //   })
+  // }
 
   const createIntersectionObserver = () => {
     // waves在视口外时停止动画

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

@@ -2,7 +2,6 @@ import { $dom } from '../library/dom'
 import { cardActive } from '../page/common'
 import { pageScroll, transition } from '../library/anime'
 import { vendorCss, vendorJs } from '../library/loadFile'
-import { pjaxScript } from '../library/scriptPjax'
 import { resizeHandle } from '../globals/handles'
 import {
   CONFIG,
@@ -61,10 +60,6 @@ export const siteRefresh = async (reload) => {
     lazyBg.observe(el)
   })
 
-  if (reload !== 1) {
-    $dom.each('script[data-pjax]', pjaxScript)
-  }
-
   setOriginTitle(document.title)
 
   resizeHandle()

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

@@ -1,11 +1,10 @@
 import domInit from './domInit'
-import { pjaxReload, siteRefresh } from './refresh'
+import { siteRefresh } from './refresh'
 import { cloudflareInit } from '../components/cloudflare'
-import { BODY, CONFIG, pjax, setPjax, setSiteSearch, siteSearch } from '../globals/globalVars'
+import { BODY, CONFIG, setSiteSearch, siteSearch } from '../globals/globalVars'
 import { autoDarkmode, themeColorListener } from '../globals/themeColor'
 import { resizeHandle, scrollHandle, visibilityListener } from '../globals/handles'
 import { pagePosition } from '../globals/tools'
-import Pjax from 'theme-shokax-pjax'
 import { initVue } from '../library/vue'
 import { $dom } from '../library/dom'
 import { createChild } from '../library/proto'
@@ -15,18 +14,6 @@ const siteInit = async () => {
   initVue()
   domInit()
 
-  setPjax(new Pjax({
-    selectors: [
-      'head title',
-      '.languages',
-      '.twikoo',
-      '.pjax',
-      '.leancloud-recent-comment',
-      'script[data-config]'
-    ],
-    cacheBust: false
-  }))
-
   CONFIG.quicklink.ignores = LOCAL.ignores
   import('quicklink').then(({listen}) => {
     listen(CONFIG.quicklink)
@@ -53,7 +40,7 @@ const siteInit = async () => {
       }
 
       import('../page/search').then(({algoliaSearch}) => {
-        algoliaSearch(pjax)
+        algoliaSearch()
       })
 
       // Handle and trigger popup window
@@ -83,13 +70,13 @@ const siteInit = async () => {
     passive: true
   })
 
-  window.addEventListener('pjax:send', pjaxReload, {
-    passive: true
-  })
+  // window.addEventListener('pjax:send', pjaxReload, {
+  //   passive: true
+  // })
 
-  window.addEventListener('pjax:success', siteRefresh, {
-    passive: true
-  }) // 默认会传入一个event参数
+  // window.addEventListener('pjax:success', siteRefresh, {
+  //   passive: true
+  // }) // 默认会传入一个event参数
 
   window.addEventListener('beforeunload', () => {
     pagePosition()

package/source/js/_app/player.ts

@@ -1,3 +1,5 @@
+// 临时性弃用，等待重构
+
 import { CONFIG, originTitle } from './globals/globalVars'
 import { showtip } from './globals/tools'
 import { pageScroll } from './library/anime'

package/source/js/_app/library/scriptPjax.ts

@@ -1,56 +0,0 @@
-export const getScript = (url: string,sri: string, callback?: Function, condition?: string): void => {
-  // url: 脚本文件的URL地址
-  // callback: 当脚本加载完成时要执行的回调函数
-  // condition: 可选的条件参数，如果存在，则执行callback
-  if (condition) {
-    // 如果条件存在，则执行回调函数
-    callback()
-  } else {
-    let script = document.createElement('script')
-
-    // @ts-ignore
-    script.onload = function (_, isAbort: boolean) {
-      // _: 事件对象
-      // isAbort: 是否中止
-      // @ts-ignore
-      if (isAbort || !script.readyState) {
-        console.log('abort!')
-        script.onload = null
-        script = undefined
-        if (!isAbort && callback) setTimeout(callback, 0)
-      }
-    }
-    script.src = url
-    script.integrity = sri
-    script.crossOrigin = 'anonymous'
-    document.head.appendChild(script)
-  }
-}
-
-export const pjaxScript = (element: HTMLScriptElement) => {
-  const { text, parentNode, id, className, type, src, dataset } = element
-  const code = text || element.textContent || element.innerHTML || ''
-  parentNode.removeChild(element)
-  const script = document.createElement('script')
-  if (id) {
-    script.id = id
-  }
-  if (className) {
-    script.className = className
-  }
-  if (type) {
-    script.type = type
-  }
-  if (src) {
-    // Force synchronous loading of peripheral JS.
-    script.src = src
-    script.async = false
-  }
-  if (dataset.pjax !== undefined) {
-    script.dataset.pjax = ''
-  }
-  if (code !== '') {
-    script.appendChild(document.createTextNode(code))
-  }
-  parentNode.appendChild(script)
-}