hexo-theme-solitude 1.1.3 → 1.2.2

package/source/js/utils.js

@@ -1,153 +1,176 @@
 const utils = {
-  debounce: function (func, wait, immediate) {
-    let timeout
-    return function () {
-      const context = this
-      const args = arguments
-      const later = function () {
-        timeout = null
-        if (!immediate) func.apply(context, args)
-      }
-      const callNow = immediate && !timeout
-      clearTimeout(timeout)
-      timeout = setTimeout(later, wait)
-      if (callNow) func.apply(context, args)
-    }
-  },
-
-  throttle: function (func, wait, options) {
-    let timeout, context, args
-    let previous = 0
-    if (!options) options = {}
-
-    const later = function () {
-      previous = options.leading === false ? 0 : new Date().getTime()
-      timeout = null
-      func.apply(context, args)
-      if (!timeout) context = args = null
-    }
+    debounce: function (func, wait, immediate) {
+        let timeout
+        return function () {
+            const context = this
+            const args = arguments
+            const later = function () {
+                timeout = null
+                if (!immediate) func.apply(context, args)
+            }
+            const callNow = immediate && !timeout
+            clearTimeout(timeout)
+            timeout = setTimeout(later, wait)
+            if (callNow) func.apply(context, args)
+        }
+    },
 
-    const throttled = function () {
-      const now = new Date().getTime()
-      if (!previous && options.leading === false) previous = now
-      const remaining = wait - (now - previous)
-      context = this
-      args = arguments
-      if (remaining <= 0 || remaining > wait) {
-        if (timeout) {
-          clearTimeout(timeout)
-          timeout = null
+    throttle: function (func, wait, options) {
+        let timeout, context, args
+        let previous = 0
+        if (!options) options = {}
+
+        const later = function () {
+            previous = options.leading === false ? 0 : new Date().getTime()
+            timeout = null
+            func.apply(context, args)
+            if (!timeout) context = args = null
         }
-        previous = now
-        func.apply(context, args)
-        if (!timeout) context = args = null
-      } else if (!timeout && options.trailing !== false) {
-        timeout = setTimeout(later, remaining)
-      }
-    }
 
-    return throttled
-  },
-
-  fadeIn: (ele, time) => {
-    ele.style.cssText = `display:block;animation: to_show ${time}s`
-  },
-
-  fadeOut: (ele, time) => {
-    ele.addEventListener('animationend', function f() {
-      ele.style.cssText = "display: none; animation: '' "
-      ele.removeEventListener('animationend', f)
-    })
-    ele.style.animation = `to_hide ${time}s`
-  },
-
-  sidebarPaddingR: () => {
-    const innerWidth = window.innerWidth
-    const clientWidth = document.body.clientWidth
-    const paddingRight = innerWidth - clientWidth
-    if (innerWidth !== clientWidth) {
-      document.body.style.paddingRight = paddingRight + 'px'
-    }
-  },
-
-  snackbarShow: (text, showAction, duration) => {
-    const sa = (typeof showAction !== 'undefined') ? showAction : false
-    const dur = (typeof duration !== 'undefined') ? duration : 5000
-    document.styleSheets[0].addRule(':root', '--sco-snackbar-time:' + dur + 'ms!important')
-    Snackbar.show({
-      text: text,
-      showAction: sa,
-      duration: dur,
-      pos: 'top-center'
-    })
-  },
-
-  copy: async (text) => {
-    try {
-      await navigator.clipboard.writeText(text)
-      utils.snackbarShow(GLOBALCONFIG.lang.copy.success, false, 2000)
-    } catch (err) {
-      utils.snackbarShow(GLOBALCONFIG.lang.copy.error, false, 2000)
-    }
-  },
+        const throttled = function () {
+            const now = new Date().getTime()
+            if (!previous && options.leading === false) previous = now
+            const remaining = wait - (now - previous)
+            context = this
+            args = arguments
+            if (remaining <= 0 || remaining > wait) {
+                if (timeout) {
+                    clearTimeout(timeout)
+                    timeout = null
+                }
+                previous = now
+                func.apply(context, args)
+                if (!timeout) context = args = null
+            } else if (!timeout && options.trailing !== false) {
+                timeout = setTimeout(later, remaining)
+            }
+        }
 
-  getEleTop: ele => {
-    let actualTop = ele.offsetTop
-    let current = ele.offsetParent
+        return throttled
+    },
 
-    while (current !== null) {
-      actualTop += current.offsetTop
-      current = current.offsetParent
-    }
+    fadeIn: (ele, time) => {
+        ele.style.cssText = `display:block;animation: to_show ${time}s`
+    },
+
+    fadeOut: (ele, time) => {
+        ele.addEventListener('animationend', function f() {
+            ele.style.cssText = "display: none; animation: '' "
+            ele.removeEventListener('animationend', f)
+        })
+        ele.style.animation = `to_hide ${time}s`
+    },
+
+    sidebarPaddingR: () => {
+        const innerWidth = window.innerWidth
+        const clientWidth = document.body.clientWidth
+        const paddingRight = innerWidth - clientWidth
+        if (innerWidth !== clientWidth) {
+            document.body.style.paddingRight = paddingRight + 'px'
+        }
+    },
+
+    snackbarShow: (text, showAction, duration) => {
+        const sa = (typeof showAction !== 'undefined') ? showAction : false
+        const dur = (typeof duration !== 'undefined') ? duration : 5000
+        document.styleSheets[0].addRule(':root', '--sco-snackbar-time:' + dur + 'ms!important')
+        Snackbar.show({
+            text: text,
+            showAction: sa,
+            duration: dur,
+            pos: 'top-center'
+        })
+    },
+
+    copy: async (text) => {
+        try {
+            await navigator.clipboard.writeText(text)
+            utils.snackbarShow(GLOBAL_CONFIG.lang.copy.success, false, 2000)
+        } catch (err) {
+            utils.snackbarShow(GLOBAL_CONFIG.lang.copy.error, false, 2000)
+        }
+    },
+
+    getEleTop: ele => {
+        let actualTop = 0
+        while (ele) {
+            actualTop += ele.offsetTop
+            ele = ele.offsetParent
+        }
+        return actualTop
+    },
+
+    randomNum: (length) => {
+        return Math.floor(Math.random() * length)
+    },
+
+    timeDiff: (timeObj, today) => {
+        var timeDiff = today.getTime() - timeObj.getTime();
+        return Math.floor(timeDiff / (1000 * 3600 * 24));
+    },
+
+    scrollToDest: (pos, time = 500) => {
+        const currentPos = window.pageYOffset
+        const isNavFixed = document.getElementById('page-header').classList.contains('nav-fixed')
+        if (currentPos > pos || isNavFixed) pos = pos - 70
+        if ('scrollBehavior' in document.documentElement.style) {
+            window.scrollTo({
+                top: pos,
+                behavior: 'smooth'
+            })
+            return
+        }
+        let start = null
+        const distance = pos - currentPos
+        window.requestAnimationFrame(function step(currentTime) {
+            start = !start ? currentTime : start
+            const progress = currentTime - start
+            if (progress < time) {
+                window.scrollTo(0, currentPos + distance * progress / time)
+                window.requestAnimationFrame(step)
+            } else {
+                window.scrollTo(0, pos)
+            }
+        })
+    },
+
+    siblings: (ele, selector) => {
+        return [...ele.parentNode.children].filter((child) => {
+            if (selector) {
+                return child !== ele && child.matches(selector)
+            }
+            return child !== ele
+        })
+    },
+    isMobile: () => /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),
+    isHidden: e => 0 === e.offsetHeight && 0 === e.offsetWidth,
+    addEventListenerPjax: function (element, eventType, callback, useCapture = false) {
+        element.addEventListener(eventType, callback, useCapture);
+        utils.addGlobalFn("pjax", function () {
+            element.removeEventListener(eventType, callback, useCapture);
+        });
+    },
+    addGlobalFn: (key, fn, name = false, parent = window) => {
+        const globalFn = parent.globalFn || {}
+        const keyObj = globalFn[key] || {}
+
+        if (name && keyObj[name]) return
 
-    return actualTop
-  },
-
-  randomNum: (length) => {
-    return Math.floor(Math.random() * length)
-  },
-
-  timeDiff: (timeObj, today) => {
-    var timeDiff = today.getTime() - timeObj.getTime();
-    return Math.floor(timeDiff / (1000 * 3600 * 24));
-  },
-
-  scrollToDest: (pos, time = 500) => {
-    const currentPos = window.pageYOffset
-    const isNavFixed = document.getElementById('page-header').classList.contains('nav-fixed')
-    if (currentPos > pos || isNavFixed) pos = pos - 70
-    if ('scrollBehavior' in document.documentElement.style) {
-      window.scrollTo({
-        top: pos,
-        behavior: 'smooth'
-      })
-      return
+        name = name || Object.keys(keyObj).length
+        keyObj[name] = fn
+        globalFn[key] = keyObj
+        parent.globalFn = globalFn
+    },
+    animateIn: (ele, text) => {
+        ele.style.display = 'block'
+        ele.style.animation = text
+    },
+    animateOut: (ele, text) => {
+        ele.addEventListener('animationend', function f() {
+            ele.style.display = ''
+            ele.style.animation = ''
+            ele.removeEventListener('animationend', f)
+        })
+        ele.style.animation = text
     }
-    let start = null
-    pos = + pos
-    window.requestAnimationFrame(function step(currentTime) {
-      start = !start ? currentTime : start
-      const progress = currentTime - start
-      if (currentPos < pos) {
-        window.scrollTo(0, ((pos - currentPos) * progress / time) + currentPos)
-      } else {
-        window.scrollTo(0, currentPos - ((currentPos - pos) * progress / time))
-      }
-      if (progress < time) {
-        window.requestAnimationFrame(step)
-      } else {
-        window.scrollTo(0, pos)
-      }
-    })
-  },
-  
-  siblings: (ele, selector) => {
-    return [...ele.parentNode.children].filter((child) => {
-      if (selector) {
-        return child !== ele && child.matches(selector)
-      }
-      return child !== ele
-    })
-  },
-  isMobile: () => /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),
-}
+}

package/layout/404.ejs

@@ -1,34 +0,0 @@
-<div id="error-wrap">
-    <div class="error-content">
-        <div class="error-img" style="background-image: url('<%= theme.errorpage.img %>')"></div>
-        <div class="error-info">
-            <h1 class="error_title">404</h1>
-            <div class="error_subtitle">
-                <%= theme.errorpage.text %>
-            </div>
-            <a class="button--animated" href="/">
-                <i class="scoicon sco-external-link"></i>
-                回到主页
-            </a>
-        </div>
-    </div>
-</div>
-<% if(theme.errorpage.recommendList){ %>
-    <div class="aside-list">
-        <div class="aside-list-group">
-            <% for (const [index, post] of site.posts.sort('-date').data.entries()){ %>
-                <% if(index >= 5)break; %>
-                <div class="aside-list-item">
-                    <a class="thumbnail" href="<%= url_for(post.path) %>" title="<%= post.title %>">
-                        <img src="<%= post.cover %>" alt="<%= post.title %>">
-                    </a>
-                    <div class="content">
-                        <a class="title" href="<%= url_for(post.path) %>" title="<%= post.title %>">
-                            <%= post.title %>
-                        </a>
-                    </div>
-                </div>        
-            <% } %>
-        </div>
-    </div>
-<% } %>

package/layout/archive.ejs

@@ -1,10 +0,0 @@
-<main class="layout" id="content-inner">
-    <div id="archive">
-        <div class="article-sort-title"><%= __('page.archives') %><sup><%= page.posts.length %></sup></div>
-        <div class="article-sort">
-            <%- partial('partial/compoment/mixins/articleSort') %>
-        </div>
-        <%- partial('partial/compoment/mixins/pagination') %>
-    </div>
-    <%- partial('partial/compoment/aside/aside') %> 
-</main>     

package/layout/category.ejs

@@ -1,18 +0,0 @@
-<main class="layout" id="content-inner">
-    <div id="category">
-        <div class="category-in-bar">
-            <div class="category-in-bar-tips">分类</div>
-            <div id="category-bar">
-                <div class="category-bar-items" id="category-bar-items">
-                    <%- partial('partial/compoment/home/homeCategoryBar', {select:page.category}) %>
-                </div>
-            </div>
-        </div>
-        <div class="article-sort-title"><%= page.category %></div>
-        <div class="article-sort">
-            <%- partial('partial/compoment/mixins/articleSort') %>
-        </div>
-        <%- partial('partial/compoment/mixins/pagination') %>
-    </div>
-    <%- partial('partial/compoment/aside/aside') %> 
-</main> 

package/layout/index.ejs

@@ -1,20 +0,0 @@
-<div id="home_top">
-    <% if(theme.hometop.bbtime){ %>
-        <%- partial('partial/compoment/hometop/bbTimeList') %>
-    <% } %>
-    <% if(theme.hometop.banner.enable){ %>
-        <%- partial('partial/hometop') %>
-    <% } %>
-</div>
-<main class="layout" id="content-inner">
-    <div class="recent-posts" id="recent-posts">
-        <div id="category-bar">
-            <%- partial('partial/compoment/home/homeCategoryBar', {select:false}) %>
-        </div>
-        <% for (const item of page.posts.sort('-date').data){ %>
-            <%- partial('partial/compoment/home/postList', {post: item}) %>
-        <% } %>
-        <%- partial('partial/compoment/mixins/pagination') %>
-    </div>
-    <%- partial('partial/compoment/aside/aside') %> 
-</main>     

package/layout/layout.ejs

@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html lang="<%= config.language %>" data-theme="light">
-<head>
-    <%- partial('partial/head', {cache: true}) %>
-</head>
-<body id="body">
-<% if(theme.loading.fullpage){ %>
-    <%- partial('partial/loading', {cache: true}) %>
-<% } %>
-<%- partial('partial/console', {cache: true}) %>
-<%- partial('partial/sidebar', {cache: true}) %>
-
-<% if(page.type !== '404'){ %>
-    <div class="<%= is_post() ? 'post' : 'page' %>" id="body-wrap">
-        <%- partial('partial/header') %>
-        <%- body %>
-        <footer id="footer">
-            <%- partial('partial/footer', {cache: true}) %>
-        </footer>
-    </div>
-<% }else{ %>
-    <div class="error" id="body-wrap">
-        <%- body %>
-    </div>
-<% } %>
-<%- partial('partial/body', {cache: true}) %>
-<%- partial('partial/compoment/third-party/search/index', {cache: true}) %>
-<%- partial('partial/compoment/third-party/music', {cache: true}) %>
-</body>
-</html>

package/layout/page/about.ejs

@@ -1,15 +0,0 @@
-<% if (theme.about) { %>
-<div id="about-page">
-    <%- partial('partial/compoment/about/authorinfo' ) %>
-    <%- partial('partial/compoment/about/contentinfo' ) %>
-    <%- partial('partial/compoment/about/skillsinfo' ) %>
-    <%- partial('partial/compoment/about/personalities' ) %>
-    <%- partial('partial/compoment/about/motto' ) %>
-    <%- partial('partial/compoment/about/hobbies' ) %>
-    <%- partial('partial/compoment/about/other' ) %>
-    <%- partial('partial/compoment/about/award' ) %>
-</div>
-<% if(theme.thirdparty.echarts.enable){%>
-    <%- js(theme.thirdparty.echarts.js) %>
-<%} %>
-<% } %>

package/layout/page/categories.ejs

@@ -1,12 +0,0 @@
-<h1 class="page-title"><%= __('page.category') %></h1>
-<div class="category-lists">
-    <div class="tag-cloud-list is-center">
-        <% site.categories.data.forEach(data => { %>
-            <a href="<%= url_for(data.path.toLowerCase()) %>">
-                <span class="tags-punctuation"></span>
-                <%= data.name %>
-                <span class="tagsPageCount"><%= data.length %></span>
-            </a>
-        <% }) %>
-    </div>
-</div>

package/layout/page/circle.ejs

@@ -1,5 +0,0 @@
-<%- partial('partial/compoment/circle/banner') %>
-<% if(theme.thirdparty.circle.angle.enable){ %>
-    <%- partial('partial/compoment/circle/angle') %>
-<% } %>
-<%- partial('partial/compoment/circle/content') %>

package/layout/page/echarts.ejs

@@ -1 +0,0 @@
-<%- page.content %>

package/layout/page/equipment.ejs

@@ -1,2 +0,0 @@
-<%- partial('partial/compoment/says/banner') %>
-<%- partial('partial/compoment/equipment/list') %>

package/layout/page/links.ejs

@@ -1,46 +0,0 @@
-<div class="flink" id="banners">
-    <%- partial('partial/compoment/links/banner') %>
-</div>
-<% if(theme.thirdparty.circle.angle.enable){ %>
-    <%- partial('partial/compoment/links/angle') %>
-<% } %>
-<div class="flink" id="article-container">
-    <% site.data.links.links.forEach(data => { %>
-        <h2><%= data.class_name %></h2>
-        <div class="flink-desc"><%= data.descr %></div>
-        <% switch (data.type) {
-        case 'card': %>
-        <%- partial('partial/compoment/links/linksCard', {data: data.link_list}) %>
-        <% break;
-        case 'item': %>
-        <%- partial('partial/compoment/links/linksItem', {data: data.link_list}) %>
-        <% break;
-        default: %>
-        <% break; } %>
-    <% }); %>
-</div>
-<h3 align="end">——本站友链排序不分先后，所有站点都值得一看。</h3>
-<% if(theme.comment.enable){ %>
-    <h2 id="友情链接申请">友情链接申请</h2>
-    <div id="article-container">
-        <%- page.content %>
-    </div>
-    <p>请<b>勾选</b>你符合的条件：</p>
-    <div id="friendlink_checkboxs">
-        <p>
-            <label><input type="checkbox" id="checkbox1" onclick="checkForm()"> 我已添加 <b><%= config.title %></b>
-                博客的友情链接</label>
-        </p>
-        <p>
-            <label><input type="checkbox" id="checkbox2" onclick="checkForm()"> 我的链接主体为
-                <b>个人</b>，网站类型为<b>博客</b></label>
-        </p>
-        <p>
-            <label><input type="checkbox" id="checkbox3" onclick="checkForm()">
-                我的网站现在可以在中国大陆区域正常访问</label>
-        </p>
-        <p>
-            <label><input type="checkbox" id="checkbox4" onclick="checkForm()"> 网站内容符合中国大陆法律法规</label>
-        </p>
-    </div>
-<% } %>

package/layout/page/page.ejs

@@ -1,3 +0,0 @@
-<div id="article-container">
-    <%- page.content %>
-</div>

package/layout/page/rss.ejs

@@ -1,39 +0,0 @@
-<main class="layout hide-aside" id="content-inner">
-    <div id="page">
-        <div class="rss-plan-list">
-            <a class="rss-plan-item rss-plan-wechat" href="<%- theme.footer.rss.wechatOA %>" title="公众号"
-               target="_blank">
-                <div class="rss-plan-description">推送精选文章<br>推送全文</div>
-                <div class="rss-plan-info-group">
-                    <div class="rss-plan-title">公众号订阅</div>
-                    <div class="rss-plan-info">推荐的订阅方式</div>
-                    <img class="rss-plan-icon" src="https://bu.dusays.com/2023/11/01/6541d14a4de78.png" alt="wechat">
-                </div>
-            </a>
-            <a class="rss-plan-item rss-plan-mail" href="<%- theme.footer.rss.emailOA %>" rel="external nofollow"
-               title="email" target="_blank">
-                <div class="rss-plan-description">推送全部文章<br>推送封面与简介</div>
-                <div class="rss-plan-info-group">
-                    <div class="rss-plan-title">邮件订阅</div>
-                    <div class="rss-plan-info">推荐的订阅方式</div>
-                    <img class="rss-plan-icon" src="https://bu.dusays.com/2023/11/01/6541d16c3ea22.png" alt="email">
-                </div>
-            </a><a class="rss-plan-item rss-plan-rss" href="<%- theme.footer.rss.rssOA %>" title="rss" target="_blank">
-                <div class="rss-plan-description">推送全部文章<br>推送简介</div>
-                <div class="rss-plan-info-group">
-                    <div class="rss-plan-title">RSS</div>
-                    <div class="rss-plan-info">备用订阅方式</div>
-                    <img class="rss-plan-icon" src="https://bu.dusays.com/2023/11/01/6541d184e2a09.png" alt="rss">
-                </div>
-            </a></div>
-        <%- page.content %>
-
-        <% if(page.comment){ %>
-            <%- partial('partial/compoment/third-party/comments/comment') %>
-        <% } %>
-    </div>
-
-    <% if(page.aside){ %>
-        <%- partial('partial/compoment/aside/aside') %>
-    <% } %>
-</main>

package/layout/page/says.ejs

@@ -1,17 +0,0 @@
-<%- partial('partial/compoment/says/banner') %>
-<div id="bber">
-    <section class="timeline page-1">
-        <ul class="list" id="waterfall">
-            <% for(let i in site.data.essay.essay_list){ %>
-                <% const item = site.data.essay.essay_list[i];if(i >= 30)break; %>
-                <li class="item">
-                    <%- partial('partial/compoment/says/saysContent', {item:item}) %>
-                    <%- partial('partial/compoment/says/saysFunction', {item:item}) %>
-                    <hr>
-                    <%- partial('partial/compoment/says/saysBottom', {item:item}) %>
-                </li>
-            <% }; %>
-        </ul>
-    </section>
-</div>
-<div id="bber-tips" style="color: var(--sco-secondtext);">- 只展示最近30条短文 -</div>

package/layout/page/tags.ejs

@@ -1,12 +0,0 @@
-<h1 class="page-title"><%= __('page.tag') %></h1>
-<div class="category-lists">
-    <div class="tag-cloud-list is-center">
-        <% site.tags.data.forEach(data => { %>
-            <a href="<%= url_for(data.path) %>">
-                <span class="tags-punctuation"></span>
-                <%= data.name %>
-                <span class="tagsPageCount"><%= data.length %></span>
-            </a>
-        <% }) %>
-    </div>
-</div>

package/layout/page/tlink.ejs

@@ -1,11 +0,0 @@
-<%- partial('partial/compoment/tlink/banner') %>
-<div class="flink" id="article-container">
-    <% site.data.tlink.links.forEach(data => { %>
-        <h2><%= data.class_name %></h2>
-        <div class="flink-desc"><%= data.descr %></div>
-        <%- partial('partial/compoment/links/linksItem', {data: data.link_list}) %>
-    <% }); %>
-</div>
-<div id="article-container">
-    <%- page.content %>
-</div>