hexo-theme-shokax 0.5.2-hotfix.2 → 0.5.3

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

@@ -1,88 +1,88 @@
-import { CONFIG } from '../globals/globalVars'
-import { init, RecentComments } from '@waline/client'
-import { pageviewCount } from '@waline/client/pageview'
-// @ts-ignore
-await import('@waline/client/style')
-
-export const walineComment = function () {
-  init({
-    el: '#comments',
-    serverURL: CONFIG.waline.serverURL,
-    lang: CONFIG.waline.lang,
-    locale: CONFIG.waline.locale,
-    emoji: CONFIG.waline.emoji,
-    meta: CONFIG.waline.meta,
-    requiredMeta: CONFIG.waline.requiredMeta,
-    wordLimit: CONFIG.waline.wordLimit,
-    pageSize: CONFIG.waline.pageSize,
-    pageview: CONFIG.waline.pageview,
-    path: window.location.pathname,
-    recaptchaV3Key: CONFIG.waline.recaptchaV3Key,
-    turnstileKey: CONFIG.waline.turnstileKey,
-    dark: 'html[data-theme="dark"]'
-  })
-}
-
-export const walinePageview = function () {
-  pageviewCount({
-    serverURL: CONFIG.waline.serverURL,
-    path: window.location.pathname
-  })
-}
-
-export const walineRecentComments = async function () {
-  const root = shokax_siteURL.replace(/^(https?:\/\/)?[^/]*/, '')
-  let items = []
-  const { comments } = await RecentComments({
-    serverURL: CONFIG.waline.serverURL.replace(/\/+$/, ''),
-    count: 10
-  })
-  // @ts-ignore
-  comments.data.forEach(function (item) {
-    let cText = (item.orig.length > 50) ? item.orig.substring(0, 50) + '...' : item.orig
-    item.url = item.url.startsWith('/') ? item.url : '/' + item.url
-    const siteLink = item.url + '#' + item.objectId
-
-    const time = new Date(item.time)
-    const now = new Date()
-    const diff = now.valueOf() - time.valueOf()
-    let dateStr:string
-    if (diff < 3600000) {
-      dateStr = `${Math.floor(diff / 60000)} 分钟前`
-    } else if (diff < 86400000) {
-      dateStr = `${Math.floor(diff / 3600000)} 小时前`
-    } else if (diff < 2592000000) {
-      dateStr = `${Math.floor(diff / 86400000)} 天前`
-    } else {
-      dateStr = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
-    }
-
-    items.push({
-      href: siteLink,
-      nick: item.nick,
-      time: dateStr,
-      text: cText
-    })
-  })
-  const newComments = new DocumentFragment()
-  items.forEach(function (item) {
-    const commentEl = document.createElement('li')
-    const commentLink = document.createElement('a')
-    const commentTime = document.createElement('span')
-    const commentText = document.createElement('span')
-
-    commentText.innerText = item.text
-    commentTime.className = 'breadcrumb'
-    commentTime.innerText = `${item.nick} @ ${item.time}`
-    commentLink.href = root + item.href
-    commentEl.className = 'item'
-
-    commentText.appendChild(document.createElement('br'))
-    commentLink.appendChild(commentTime)
-    commentLink.appendChild(commentText)
-    commentEl.appendChild(commentLink)
-    newComments.appendChild(commentEl)
-  })
-
-  document.getElementById("new-comment").appendChild(newComments)
-}
+import { CONFIG } from '../globals/globalVars'
+import { init, RecentComments } from '@waline/client'
+import { pageviewCount } from '@waline/client/pageview'
+// @ts-ignore
+await import('@waline/client/style')
+
+export const walineComment = function () {
+  init({
+    el: '#comments',
+    serverURL: CONFIG.waline.serverURL,
+    lang: CONFIG.waline.lang,
+    locale: CONFIG.waline.locale,
+    emoji: CONFIG.waline.emoji,
+    meta: CONFIG.waline.meta,
+    requiredMeta: CONFIG.waline.requiredMeta,
+    wordLimit: CONFIG.waline.wordLimit,
+    pageSize: CONFIG.waline.pageSize,
+    pageview: CONFIG.waline.pageview,
+    path: window.location.pathname,
+    recaptchaV3Key: CONFIG.waline.recaptchaV3Key,
+    turnstileKey: CONFIG.waline.turnstileKey,
+    dark: 'html[data-theme="dark"]'
+  })
+}
+
+export const walinePageview = function () {
+  pageviewCount({
+    serverURL: CONFIG.waline.serverURL,
+    path: window.location.pathname
+  })
+}
+
+export const walineRecentComments = async function () {
+  const root = shokax_siteURL.replace(/^(https?:\/\/)?[^/]*/, '')
+  let items = []
+  const { comments } = await RecentComments({
+    serverURL: CONFIG.waline.serverURL.replace(/\/+$/, ''),
+    count: 10
+  })
+  // @ts-ignore
+  comments.data.forEach(function (item) {
+    let cText = (item.orig.length > 50) ? item.orig.substring(0, 50) + '...' : item.orig
+    item.url = item.url.startsWith('/') ? item.url : '/' + item.url
+    const siteLink = item.url + '#' + item.objectId
+
+    const time = new Date(item.time)
+    const now = new Date()
+    const diff = now.valueOf() - time.valueOf()
+    let dateStr:string
+    if (diff < 3600000) {
+      dateStr = `${Math.floor(diff / 60000)} 分钟前`
+    } else if (diff < 86400000) {
+      dateStr = `${Math.floor(diff / 3600000)} 小时前`
+    } else if (diff < 2592000000) {
+      dateStr = `${Math.floor(diff / 86400000)} 天前`
+    } else {
+      dateStr = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
+    }
+
+    items.push({
+      href: siteLink,
+      nick: item.nick,
+      time: dateStr,
+      text: cText
+    })
+  })
+  const newComments = new DocumentFragment()
+  items.forEach(function (item) {
+    const commentEl = document.createElement('li')
+    const commentLink = document.createElement('a')
+    const commentTime = document.createElement('span')
+    const commentText = document.createElement('span')
+
+    commentText.innerText = item.text
+    commentTime.className = 'breadcrumb'
+    commentTime.innerText = `${item.nick} @ ${item.time}`
+    commentLink.href = root + item.href
+    commentEl.className = 'item'
+
+    commentText.appendChild(document.createElement('br'))
+    commentLink.appendChild(commentTime)
+    commentLink.appendChild(commentText)
+    commentEl.appendChild(commentLink)
+    newComments.appendChild(commentEl)
+  })
+
+  document.getElementById("new-comment").appendChild(newComments)
+}

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

@@ -1,243 +1,243 @@
-/* 边栏分区 */
-
-import { CONFIG, Container, diffY, menuToggle, showContents, sideBar } from '../globals/globalVars'
-import { clipBoard } from '../globals/tools'
-import { pageScroll, transition } from '../library/anime'
-import { getHeight, setDisplay } from '../library/proto'
-
-export const sideBarToggleHandle = (event:Event, force?:number) => {
-  if (sideBar.classList.contains('on')) {
-    sideBar.classList.remove('on')
-    menuToggle.classList.remove('close')
-    if (force) {
-      // @ts-ignore
-      // noinspection JSConstantReassignment
-      sideBar.style = ''
-    } else {
-      transition(sideBar, 'slideRightOut')
-    }
-  } else {
-    if (force) {
-      // @ts-ignore
-      // noinspection JSConstantReassignment
-      sideBar.style = ''
-    } else {
-      transition(sideBar, 'slideRightIn', () => {
-        sideBar.classList.add('on')
-        menuToggle.classList.add('close')
-      })
-    }
-  }
-}
-
-export const sideBarTab = () => {
-  const sideBarInner = sideBar.querySelector('.inner')
-
-  if (sideBar.querySelector('.tab')) {
-    sideBarInner.removeChild(sideBar.querySelector('.tab'))
-  }
-
-  const list = document.createElement('ul'); let active = 'active'
-  list.className = 'tab';
-
-  ['contents', 'related', 'overview'].forEach((item) => {
-    const element = sideBar.querySelector('.panel.' + item)
-
-    if (element.innerHTML.trim().length < 1) {
-      if (item === 'contents') {
-        setDisplay(showContents, 'none')
-      }
-      return
-    }
-
-    if (item === 'contents') {
-      setDisplay(showContents, '')
-    }
-
-    const tab = document.createElement('li')
-    const span = document.createElement('span')
-    const text = document.createTextNode(element.getAttribute('data-title'))
-    span.appendChild(text)
-    tab.appendChild(span)
-    tab.classList.add(item)
-    tab.classList.add('item')
-
-    if (active) {
-      element.classList.add(active)
-      tab.classList.add(active)
-    } else {
-      element.classList.remove('active')
-    }
-    tab.addEventListener('click', (event) => {
-      const target = event.currentTarget as HTMLElement
-      if (target.classList.contains('active')) return
-
-      sideBar.querySelectorAll('.tab .item').forEach((element) => {
-        element.classList.remove('active')
-      })
-
-      sideBar.querySelectorAll('.panel').forEach((element) => {
-        element.classList.remove('active')
-      })
-
-      sideBar.querySelector('.panel.' + target.className.replace(' item', '')).classList.add('active')
-
-      target.classList.add('active')
-    })
-
-    list.appendChild(tab)
-    active = ''
-  })
-
-  if (list.childNodes.length > 1) {
-    sideBarInner.insertBefore(list, sideBarInner.childNodes[0]);
-    (sideBar.querySelector('.panels') as HTMLElement).style.paddingTop = ''
-  } else {
-    (sideBar.querySelector('.panels') as HTMLElement).style.paddingTop = '.625rem'
-  }
-}
-
-export const sidebarTOC = () => {
-  const activateNavByIndex = (index:number): void => {
-    const target = navItems[index]
-
-    if (!target) return
-
-    if (target.classList.contains('current')) {
-      return
-    }
-
-    document.querySelectorAll('.toc .active').forEach((element) => {
-      element && element.classList.remove('active')
-      element && element.classList.remove('current')
-    })
-
-    sections.forEach((element) => {
-      element && element.classList.remove('active')
-    })
-
-    target.classList.add('active')
-    target.classList.add('current')
-    sections[index] && sections[index].classList.add('active')
-
-    let parent = <Element> target.parentNode
-
-    while (!parent.matches('.contents')) {
-      if (parent.matches('li')) {
-        parent.classList.add('active')
-        const t = document.getElementById(decodeURIComponent(parent.querySelector('a.toc-link').getAttribute('href').replace('#', '')))
-        if (t) {
-          t.classList.add('active')
-        }
-      }
-      parent = <Element> parent.parentNode
-    }
-    // Scrolling to center active TOC element if TOC content is taller than viewport.
-    if (getComputedStyle(sideBar).display !== 'none' && tocElement.classList.contains('active')) {
-      pageScroll((tocElement as HTMLElement), target.offsetTop - ((tocElement as HTMLElement).offsetHeight / 4))
-    }
-  }
-  const navItems = document.querySelectorAll<HTMLElement>('.contents li')
-
-  if (navItems.length < 1) {
-    return
-  }
-
-  let sections = [...navItems] as HTMLElement[]
-  let activeLock = null
-
-  sections = sections.map((element, index) => {
-    const link = element.querySelector('a.toc-link')
-    const linkHref = link.getAttribute('href')
-    if (!linkHref) return null
-    const anchor = document.getElementById(decodeURI(linkHref.replace('#', '')))
-    if (!anchor) return null
-    const alink = anchor.querySelector('a.anchor')
-
-    const anchorScroll = (event:MouseEvent) => {
-      event.preventDefault()
-      const target = document.getElementById(decodeURI((event.currentTarget as HTMLElement).getAttribute('href').replace('#', '')))
-
-      activeLock = index
-      pageScroll(document.body, target.offsetTop, () => {
-        activateNavByIndex(index)
-        activeLock = null
-      })
-    }
-
-    // TOC item animation navigate.
-    link.addEventListener('click', anchorScroll)
-    alink && alink.addEventListener('click', (event) => {
-      anchorScroll(<MouseEvent>event)
-      clipBoard(CONFIG.hostname + '/' + LOCAL.path + (event.currentTarget as HTMLElement).getAttribute('href'))
-    })
-    return (anchor as HTMLElement)
-  })
-
-  const tocElement = sideBar.querySelector('.contents.panel')
-
-  const findIndex = (entries: IntersectionObserverEntry[]) => {
-    let index = 0
-    let entry = entries[index]
-
-    if (entry.boundingClientRect.top > 0) {
-      index = sections.indexOf(entry.target as HTMLElement)
-      return index === 0 ? 0 : index - 1
-    }
-    for (; index < entries.length; index++) {
-      if (entries[index].boundingClientRect.top <= 0) {
-        entry = entries[index]
-      } else {
-        return sections.indexOf(entry.target as HTMLElement)
-      }
-    }
-    return sections.indexOf(entry.target as HTMLElement)
-  }
-
-  const createIntersectionObserver = () => {
-    const observer = new IntersectionObserver((entries) => {
-      const index = findIndex(entries) + (diffY < 0 ? 1 : 0)
-      if (activeLock === null) {
-        activateNavByIndex(index)
-      }
-    }, {
-      rootMargin: '0px 0px -100% 0px', threshold: 0
-    })
-
-    sections.forEach((element) => {
-      element && observer.observe(element)
-    })
-  }
-
-  createIntersectionObserver()
-}
-
-export const backToTopHandle = () => {
-  pageScroll(0)
-}
-
-export const goToBottomHandle = () => {
-  pageScroll(parseInt(String(getHeight(Container))))
-}
-
-export const goToCommentHandle = () => {
-  pageScroll(document.getElementById('comments'))
-}
-
-export const menuActive = () => {
-  document.querySelectorAll('.menu .item:not(.title)').forEach((element) => {
-    const target = <HTMLAnchorElement> element.querySelector('a[href]')
-    const parentItem = element.parentNode.parentNode as HTMLElement
-    if (!target) return
-    const isSamePath = target.pathname === location.pathname || target.pathname === location.pathname.replace('index.html', '')
-    const isSubPath = !CONFIG.root.startsWith(target.pathname) && location.pathname.startsWith(target.pathname)
-    const active = !target.onclick && target.hostname === location.hostname && (isSamePath || isSubPath)
-    element.classList.toggle('active', active)
-    if (element.parentNode.querySelector('.active') && parentItem.classList.contains('dropdown')) {
-      parentItem.classList.remove('active')
-      parentItem.classList.add('expand')
-    } else {
-      parentItem.classList.remove('expand')
-    }
-  })
-}
+/* 边栏分区 */
+
+import { CONFIG, Container, diffY, menuToggle, showContents, sideBar } from '../globals/globalVars'
+import { clipBoard } from '../globals/tools'
+import { pageScroll, transition } from '../library/anime'
+import { getHeight, setDisplay } from '../library/proto'
+
+export const sideBarToggleHandle = (event:Event, force?:number) => {
+  if (sideBar.classList.contains('on')) {
+    sideBar.classList.remove('on')
+    menuToggle.classList.remove('close')
+    if (force) {
+      // @ts-ignore
+      // noinspection JSConstantReassignment
+      sideBar.style = ''
+    } else {
+      transition(sideBar, 'slideRightOut')
+    }
+  } else {
+    if (force) {
+      // @ts-ignore
+      // noinspection JSConstantReassignment
+      sideBar.style = ''
+    } else {
+      transition(sideBar, 'slideRightIn', () => {
+        sideBar.classList.add('on')
+        menuToggle.classList.add('close')
+      })
+    }
+  }
+}
+
+export const sideBarTab = () => {
+  const sideBarInner = sideBar.querySelector('.inner')
+
+  if (sideBar.querySelector('.tab')) {
+    sideBarInner.removeChild(sideBar.querySelector('.tab'))
+  }
+
+  const list = document.createElement('ul'); let active = 'active'
+  list.className = 'tab';
+
+  ['contents', 'related', 'overview'].forEach((item) => {
+    const element = sideBar.querySelector('.panel.' + item)
+
+    if (element.innerHTML.trim().length < 1) {
+      if (item === 'contents') {
+        setDisplay(showContents, 'none')
+      }
+      return
+    }
+
+    if (item === 'contents') {
+      setDisplay(showContents, '')
+    }
+
+    const tab = document.createElement('li')
+    const span = document.createElement('span')
+    const text = document.createTextNode(element.getAttribute('data-title'))
+    span.appendChild(text)
+    tab.appendChild(span)
+    tab.classList.add(item)
+    tab.classList.add('item')
+
+    if (active) {
+      element.classList.add(active)
+      tab.classList.add(active)
+    } else {
+      element.classList.remove('active')
+    }
+    tab.addEventListener('click', (event) => {
+      const target = event.currentTarget as HTMLElement
+      if (target.classList.contains('active')) return
+
+      sideBar.querySelectorAll('.tab .item').forEach((element) => {
+        element.classList.remove('active')
+      })
+
+      sideBar.querySelectorAll('.panel').forEach((element) => {
+        element.classList.remove('active')
+      })
+
+      sideBar.querySelector('.panel.' + target.className.replace(' item', '')).classList.add('active')
+
+      target.classList.add('active')
+    })
+
+    list.appendChild(tab)
+    active = ''
+  })
+
+  if (list.childNodes.length > 1) {
+    sideBarInner.insertBefore(list, sideBarInner.childNodes[0]);
+    (sideBar.querySelector('.panels') as HTMLElement).style.paddingTop = ''
+  } else {
+    (sideBar.querySelector('.panels') as HTMLElement).style.paddingTop = '.625rem'
+  }
+}
+
+export const sidebarTOC = () => {
+  const activateNavByIndex = (index:number): void => {
+    const target = navItems[index]
+
+    if (!target) return
+
+    if (target.classList.contains('current')) {
+      return
+    }
+
+    document.querySelectorAll('.toc .active').forEach((element) => {
+      element && element.classList.remove('active')
+      element && element.classList.remove('current')
+    })
+
+    sections.forEach((element) => {
+      element && element.classList.remove('active')
+    })
+
+    target.classList.add('active')
+    target.classList.add('current')
+    sections[index] && sections[index].classList.add('active')
+
+    let parent = <Element> target.parentNode
+
+    while (!parent.matches('.contents')) {
+      if (parent.matches('li')) {
+        parent.classList.add('active')
+        const t = document.getElementById(decodeURIComponent(parent.querySelector('a.toc-link').getAttribute('href').replace('#', '')))
+        if (t) {
+          t.classList.add('active')
+        }
+      }
+      parent = <Element> parent.parentNode
+    }
+    // Scrolling to center active TOC element if TOC content is taller than viewport.
+    if (getComputedStyle(sideBar).display !== 'none' && tocElement.classList.contains('active')) {
+      pageScroll((tocElement as HTMLElement), target.offsetTop - ((tocElement as HTMLElement).offsetHeight / 4))
+    }
+  }
+  const navItems = document.querySelectorAll<HTMLElement>('.contents li')
+
+  if (navItems.length < 1) {
+    return
+  }
+
+  let sections = [...navItems] as HTMLElement[]
+  let activeLock = null
+
+  sections = sections.map((element, index) => {
+    const link = element.querySelector('a.toc-link')
+    const linkHref = link.getAttribute('href')
+    if (!linkHref) return null
+    const anchor = document.getElementById(decodeURI(linkHref.replace('#', '')))
+    if (!anchor) return null
+    const alink = anchor.querySelector('a.anchor')
+
+    const anchorScroll = (event:MouseEvent) => {
+      event.preventDefault()
+      const target = document.getElementById(decodeURI((event.currentTarget as HTMLElement).getAttribute('href').replace('#', '')))
+
+      activeLock = index
+      pageScroll(document.body, target.offsetTop, () => {
+        activateNavByIndex(index)
+        activeLock = null
+      })
+    }
+
+    // TOC item animation navigate.
+    link.addEventListener('click', anchorScroll)
+    alink && alink.addEventListener('click', (event) => {
+      anchorScroll(<MouseEvent>event)
+      clipBoard(CONFIG.hostname + '/' + LOCAL.path + (event.currentTarget as HTMLElement).getAttribute('href'))
+    })
+    return (anchor as HTMLElement)
+  })
+
+  const tocElement = sideBar.querySelector('.contents.panel')
+
+  const findIndex = (entries: IntersectionObserverEntry[]) => {
+    let index = 0
+    let entry = entries[index]
+
+    if (entry.boundingClientRect.top > 0) {
+      index = sections.indexOf(entry.target as HTMLElement)
+      return index === 0 ? 0 : index - 1
+    }
+    for (; index < entries.length; index++) {
+      if (entries[index].boundingClientRect.top <= 0) {
+        entry = entries[index]
+      } else {
+        return sections.indexOf(entry.target as HTMLElement)
+      }
+    }
+    return sections.indexOf(entry.target as HTMLElement)
+  }
+
+  const createIntersectionObserver = () => {
+    const observer = new IntersectionObserver((entries) => {
+      const index = findIndex(entries) + (diffY < 0 ? 1 : 0)
+      if (activeLock === null) {
+        activateNavByIndex(index)
+      }
+    }, {
+      rootMargin: '0px 0px -100% 0px', threshold: 0
+    })
+
+    sections.forEach((element) => {
+      element && observer.observe(element)
+    })
+  }
+
+  createIntersectionObserver()
+}
+
+export const backToTopHandle = () => {
+  pageScroll(0)
+}
+
+export const goToBottomHandle = () => {
+  pageScroll(parseInt(String(getHeight(Container))))
+}
+
+export const goToCommentHandle = () => {
+  pageScroll(document.getElementById('comments'))
+}
+
+export const menuActive = () => {
+  document.querySelectorAll('.menu .item:not(.title)').forEach((element) => {
+    const target = <HTMLAnchorElement> element.querySelector('a[href]')
+    const parentItem = element.parentNode.parentNode as HTMLElement
+    if (!target) return
+    const isSamePath = target.pathname === location.pathname || target.pathname === location.pathname.replace('index.html', '')
+    const isSubPath = !CONFIG.root.startsWith(target.pathname) && location.pathname.startsWith(target.pathname)
+    const active = !target.onclick && target.hostname === location.hostname && (isSamePath || isSubPath)
+    element.classList.toggle('active', active)
+    if (element.parentNode.querySelector('.active') && parentItem.classList.contains('dropdown')) {
+      parentItem.classList.remove('active')
+      parentItem.classList.add('expand')
+    } else {
+      parentItem.classList.remove('expand')
+    }
+  })
+}