hexo-theme-solitude 1.7.10 → 1.7.12

package/_config.yml

@@ -64,6 +64,7 @@ nav:
   right:
     random: false # 随机文章跳转 / random post button
     console: false #控制台 / console
+    top: false # 进度球 / Progress Ball
     # 自定义按钮
     # custom button
     # 左至右

package/layout/includes/inject/head.pug

@@ -111,7 +111,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.10",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.12",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"

package/layout/includes/page/says.pug

@@ -2,7 +2,7 @@ include ../widgets/page/banner
 if theme.says.enable
     #bber
         section.timeline.page-1
-            ul.list#waterfall
+            ul.list.waterfall
                 each item in site.data.essay.essay_list.slice(0, theme.says.strip)
                     li.item
                         if theme.says.style === 2

package/layout/includes/widgets/nav/right.pug

@@ -15,10 +15,47 @@ if theme.nav.right.console
     .nav-button#nav-console
         a.console_switchbutton(onclick="sco.showConsole()", title=_p('nav.console'), href="javascript:void(0);")
             i.solitude.st-dashboard-fill
-.nav-button#nav-totop(onclick="sco.toTop()")
-    a.totopbtn
-        i.solitude.st-arrow-up-line
-        span#percent= "0"
+if theme.nav.right.top
+    .nav-button#nav-totop(onclick="sco.toTop()")
+        a.totopbtn
+            i.solitude.st-arrow-up-line
+            span#percent= "0"
+
+    script.
+        document.addEventListener('DOMContentLoaded', () => {
+            const percent = () => {
+                let scrollTop = document.documentElement.scrollTop || window.pageYOffset
+                let totalHeight = Math.max(document.body.scrollHeight, document.documentElement.scrollHeight, document.body.offsetHeight, document.documentElement.offsetHeight, document.body.clientHeight, document.documentElement.clientHeight) - document.documentElement.clientHeight
+                let scrollPercent = Math.round(scrollTop / totalHeight * 100)
+                let percentElement = document.querySelector("#percent")
+                let viewportBottom = window.scrollY + document.documentElement.clientHeight
+                let remainingScroll = totalHeight - scrollTop
+
+                if ((document.getElementById("post-comment") || document.getElementById("footer")).offsetTop < viewportBottom || scrollPercent > 90) {
+                    document.querySelector("#nav-totop").classList.add("long")
+                    percentElement.innerHTML = GLOBAL_CONFIG.lang.backtop
+                } else {
+                    document.querySelector("#nav-totop").classList.remove("long")
+                    if (scrollPercent >= 0) {
+                        percentElement.innerHTML = scrollPercent + ""
+                    }
+                }
+
+                let elementsToHide = document.querySelectorAll(".needEndHide")
+                if (remainingScroll < 100) {
+                    elementsToHide.forEach(function (element) {
+                        element.classList.add("hide")
+                    })
+                } else {
+                    elementsToHide.forEach(function (element) {
+                        element.classList.remove("hide")
+                    })
+                }
+
+                window.onscroll = percent
+            }
+            percent()
+        })
 #toggle-menu
     a.site-page
         i.solitude.st-menu-line

package/layout/includes/widgets/third-party/search/algolia-search.pug

@@ -12,7 +12,7 @@
         #search-results
             #algolia-hits
                 each tag in theme.search.tags || []
-                    a.tag-list(href="javascript:void(0);" onclick="pjax.loadUrl('/tags/" + tag + "/')")=tag
+                    a.tag-list(href='javascript:void(0);' onclick="pjax.loadUrl('" + url_for('/tags/' + tag) + "/')")=tag
 
         #algolia-tips
             #algolia-pagination

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

@@ -10,7 +10,7 @@
             div#search-results
                 #search-hits
                     each tag in theme.search.tags || []
-                        a.tag-list(href='javascript:void(0);' onclick="pjax.loadUrl('/tags/" + tag + "/')")=tag
+                        a.tag-list(href='javascript:void(0);' onclick="pjax.loadUrl('" + url_for('/tags/' + tag) + "/')")=tag
             div#search-pagination
             div#search-tips
     div#search-mask

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the efu.",
   "main": "package.json",
   "scripts": {

package/plugins.yml

@@ -1,11 +1,11 @@
 algolia_search:
   name: algoliasearch
   file: dist/algoliasearch-lite.umd.js
-  version: 4.22.0
+  version: 4.23.2
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.63.0
+  version: 4.66.1
 pjax:
   name: pjax
   file: pjax.min.js
@@ -13,7 +13,7 @@ pjax:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.6.31
+  version: 1.6.32
 waline_js:
   name: 'waline'
   file: dist/waline.js
@@ -27,14 +27,10 @@ valine:
   name: valine
   file: dist/Valine.min.js
   version: 1.5.1
-sharejs:
-  name: butterfly-extsrc
-  file: sharejs/dist/js/social-share.min.js
-  version: 1.1.3
-sharejs_css:
-  name: butterfly-extsrc
-  file: sharejs/dist/css/share.min.css
-  version: 1.1.3
+discuss:
+  name: discuss
+  file: dist/discuss.js
+  version: 1.2.7
 katex:
   name: katex
   file: dist/katex.min.css
@@ -48,7 +44,7 @@ katex_copytex:
 lazyload:
   name: vanilla-lazyload
   file: dist/lazyload.iife.min.js
-  version: 17.8.5
+  version: 19.1.3
 aplayer_css:
   name: aplayer
   file: dist/APlayer.min.css
@@ -67,13 +63,15 @@ pace_js:
   file: pace.min.js
   version: 1.2.4
 swiper_css:
-  name: Swiper
+  name: swiper
   file: swiper-bundle.min.css
   version: 11.0.5
+  other_name: Swiper
 swiper_js:
-  name: Swiper
+  name: swiper
   file: swiper-bundle.min.js
   version: 11.0.5
+  other_name: Swiper
 busuanzi_js:
   name: busuanzi
   file: bsz.pure.mini.js
@@ -91,13 +89,15 @@ medium_zoom:
   file: dist/medium-zoom.min.js
   version: 1.1.0
 fancyapps_ui:
-  name: fancyapps-ui
+  name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.umd.js
-  version: 5.0.33
+  version: 5.0.35
+  other_name: fancyapps-ui
 fancyapps_css:
-  name: fancyapps-ui
-  file: dist/fancybox/fancybox.min.css
-  version: 5.0.33
+  name: '@fancyapps/ui'
+  file: dist/fancybox/fancybox.css
+  version: 5.0.35
+  other_name: fancyapps-ui
 mermaid_js:
   name: mermaid
   file: dist/mermaid.min.js

package/scripts/tags/gallery.js

@@ -28,7 +28,7 @@ const gallery = (args, content) => {
         }
         html += `<div class="gallery-item"><img class="nolazyload" src=${m[2]} alt="${m[1]}" /></div>`
     }
-    return `<div class="gallery-container" id="waterfall">
+    return `<div class="gallery-container waterfall">
         ${html}
       </div>`
 }

package/source/css/_layout/header.styl

@@ -267,17 +267,17 @@
 
   &.no-top-img
     margin-bottom 0
+  if hexo-config('nav.right.top')
+    &:not(.nav-fixed)
+      #percent
+        transition .3s
 
-  &:not(.nav-fixed)
-    #percent
-      transition .3s
-
-    #nav-right #nav-totop
-      width 0
-      transform scale(0)
-      margin-left 0
-      overflow hidden
-      transition .3s ease-in
+      #nav-right #nav-totop
+        width 0
+        transform scale(0)
+        margin-left 0
+        overflow hidden
+        transition .3s ease-in
 
 #page-header #scroll-down .scroll-down-effects,
 #page-header #site-subtitle, #page-header #site-title
@@ -606,40 +606,51 @@
 #site-logo
   width 121px
 
-#nav-totop
-  position relative
-  width 35px
-  height 35px
-  display flex
-  border-radius 40px
-  transition all .3s ease-in-out
-  align-items center
-
-  &.long
-    width 80px
-
-  .totopbtn
-    padding-top 0
+if hexo-config('nav.right.top')
+  #nav-totop
+    position relative
+    width 35px
+    height 35px
+    display flex
+    border-radius 40px
+    transition all .3s ease-in-out
+    align-items center
 
-    i
-      position absolute
-      display flex
-      font-size 22px
-      opacity 0
-      line-height 1
+    &.long
+      width 80px
 
-  &:hover
     .totopbtn
+      padding-top 0
+
       i
-        opacity 1
-        color var(--efu-card-bg)
-        transition .3s
+        position absolute
+        display flex
+        font-size 22px
+        opacity 0
+        line-height 1
+
+    &:hover
+      .totopbtn
+        i
+          opacity 1
+          color var(--efu-card-bg)
+          transition .3s
+
+      #percent
+        opacity 0
+        font-weight 700
 
     #percent
-      opacity 0
-      font-weight 700
+      font-size 12px
+      border-radius 35px
+      display flex
+      justify-content center
+      align-items center
+      transition .3s
+      white-space nowrap
 
-  #percent
+  .nav-fixed #nav-totop #percent,
+  .page #nav-totop #percent
     font-size 12px
     border-radius 35px
     display flex
@@ -648,16 +659,6 @@
     transition .3s
     white-space nowrap
 
-.nav-fixed #nav-totop #percent,
-.page #nav-totop #percent
-  font-size 12px
-  border-radius 35px
-  display flex
-  justify-content center
-  align-items center
-  transition .3s
-  white-space nowrap
-
 if hexo-config('nav.group')
   .back-home-button
     display flex

package/source/css/_page/says.styl

@@ -275,14 +275,7 @@ if hexo-config('says.enable')
         text-align justify
 
     .timeline
-      #waterfall
-        opacity 0
-        transition .3s
-
-        &.show
-          opacity 1
-
-      ul
+       ul
         li
           &.item
             position relative

package/source/css/_tags/gallery.styl

@@ -104,4 +104,10 @@
     img
       max-width: 100%;
       border-radius: 0;
-      margin 0
+      margin 0
+
+.waterfall
+  opacity 0
+  transition .3s
+  &.show
+    opacity 1

package/source/js/main.js

@@ -30,7 +30,7 @@ const sidebarFn = () => {
         if (utils.isHidden($toggleMenu)) {
             if ($mobileSidebarMenus.classList.contains('open')) closeMobileSidebar()
         }
-        sco.reflashEssayWaterFall();
+        sco.refreshWaterFall();
     })
 }
 
@@ -54,8 +54,6 @@ const scrollFn = function () {
         } else {
             $header.classList.remove('nav-fixed', 'nav-visible');
         }
-
-        percent();
     }, 200));
 
     function scrollDirection(currentTop) {
@@ -65,38 +63,6 @@ const scrollFn = function () {
     }
 }
 
-const percent = () => {
-    let scrollTop = document.documentElement.scrollTop || window.pageYOffset
-    let totalHeight = Math.max(document.body.scrollHeight, document.documentElement.scrollHeight, document.body.offsetHeight, document.documentElement.offsetHeight, document.body.clientHeight, document.documentElement.clientHeight) - document.documentElement.clientHeight
-    let scrollPercent = Math.round(scrollTop / totalHeight * 100)
-    let percentElement = document.querySelector("#percent")
-    let viewportBottom = window.scrollY + document.documentElement.clientHeight
-    let remainingScroll = totalHeight - scrollTop
-
-    if ((document.getElementById("post-comment") || document.getElementById("footer")).offsetTop < viewportBottom || scrollPercent > 90) {
-        document.querySelector("#nav-totop").classList.add("long")
-        percentElement.innerHTML = GLOBAL_CONFIG.lang.backtop
-    } else {
-        document.querySelector("#nav-totop").classList.remove("long")
-        if (scrollPercent >= 0) {
-            percentElement.innerHTML = scrollPercent + ""
-        }
-    }
-
-    let elementsToHide = document.querySelectorAll(".needEndHide")
-    if (remainingScroll < 100) {
-        elementsToHide.forEach(function (element) {
-            element.classList.add("hide")
-        })
-    } else {
-        elementsToHide.forEach(function (element) {
-            element.classList.remove("hide")
-        })
-    }
-
-    window.onscroll = percent
-}
-
 
 const showTodayCard = () => {
     const el = document.getElementById('todayCard')
@@ -329,14 +295,11 @@ let sco = {
         const el = document.getElementById('console')
         el && el.classList.remove('show')
     },
-    reflashEssayWaterFall: function () {
-        const el = document.getElementById('waterfall')
-        el && (() => {
-            setTimeout(function () {
-                waterfall('#waterfall');
-                el.classList.add('show');
-            }, 500);
-        })();
+    refreshWaterFall: function () {
+        const els = document.querySelectorAll('.waterfall')
+        if (els.length !== 0) {
+            els.forEach(el => waterfall(el) || el.classList.add('show'))
+        }
     },
     addRuntime: function () {
         let el = document.getElementById('runtimeshow')
@@ -461,17 +424,13 @@ let sco = {
             categoryBarItems.forEach(item => {
                 item.classList.remove("select");
             });
-        }
-        if (decodedPath === "/") {
-            if (categoryBar) {
+            if (decodedPath === "/") {
                 const homeItem = document.getElementById("category-bar-home");
                 homeItem.classList.add("select");
-            }
-        } else {
-            if (/\/categories\/.*?\//.test(decodedPath)) {
-                let category = decodedPath.split("/").slice(-2, -1)[0];
-                category = category.charAt(0).toUpperCase() + category.slice(1);
-                if (categoryBar) {
+            } else {
+                if (/\/categories\/.*?\//.test(decodedPath)) {
+                    let category = decodedPath.split("/").slice(-2, -1)[0];
+                    category = category.charAt(0).toUpperCase() + category.slice(1);
                     const categoryItem = document.getElementById(category);
                     if (categoryItem) {
                         categoryItem.classList.add("select");
@@ -831,18 +790,21 @@ class tabs {
     }
 }
 
+sco.initAdjust()
+initObserver()
+addCopyright()
+sco.initConsoleState()
+
 window.refreshFn = () => {
+    document.body.setAttribute('data-type', PAGE_CONFIG.page)
     if (PAGE_CONFIG.is_home || PAGE_CONFIG.is_page) {
         sco.changeTimeFormat(document.querySelectorAll('#recent-posts time, .webinfo-item time'))
         GLOBAL_CONFIG.runtime && sco.addRuntime()
     } else {
         sco.changeTimeFormat(document.querySelectorAll('#post-meta time'))
     }
-
-    sco.initAdjust()
     scrollFn()
     sidebarFn()
-    initObserver()
     sco.hideCookie()
     sco.addPhotoFigcaption()
     sco.setTimeState()
@@ -850,19 +812,16 @@ window.refreshFn = () => {
     sco.categoriesBarActive()
     sco.listenToPageInputPress()
     sco.addNavBackgroundInit()
-    sco.reflashEssayWaterFall()
+    sco.refreshWaterFall()
     GLOBAL_CONFIG.lazyload.enable && utils.lazyloadImg()
     GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll("#article-container img:not(.flink-avatar,.gallery-group img)"))
     GLOBAL_CONFIG.randomlink && randomLinksList()
     PAGE_CONFIG.comment && initComment()
     PAGE_CONFIG.toc && toc.init();
     (PAGE_CONFIG.is_post || PAGE_CONFIG.is_page) && ((addHighlight()) || tabs.init())
-    addCopyright()
     PAGE_CONFIG.is_home && showTodayCard()
     GLOBAL_CONFIG.covercolor.enable && coverColor()
-    sco.initConsoleState()
     GLOBAL_CONFIG.comment.commentBarrage && PAGE_CONFIG.comment && initializeCommentBarrage()
-    document.body.setAttribute('data-type', PAGE_CONFIG.page)
     PAGE_CONFIG.page === "music" && scoMusic.init()
     GLOBAL_CONFIG.post_ai && PAGE_CONFIG.page === "post" && efu_ai.init()
 }

package/source/js/right_menu.js

@@ -222,7 +222,6 @@ window.oncontextmenu = (ele) => {
     rm.menuItems.paste.addEventListener('click', () => rm.pasteText() && rm.hideRightMenu())
     rm.menuItems.comment.addEventListener('click', () => rm.hideRightMenu() || sco.toTalk(selectTextNow))
     rm.menuItems.new.addEventListener('click', () => window.open(rm.domhref) && rm.hideRightMenu())
-    rm.menuItems.search.addEventListener('click', () => rm.hideRightMenu())
     rm.menuItems.downloadImg.addEventListener('click', () => rm.downloadImage() && rm.hideRightMenu())
     rm.menuItems.copyImg.addEventListener('click', () => rm.copyImage() && rm.hideRightMenu())
 }()

package/source/js/search/local.js

@@ -28,6 +28,15 @@ window.onload = () => {
         window.removeEventListener("resize", fixSafariHeight);
     };
 
+    const addEventTagList = () => {
+        const list = document.querySelectorAll("#local-search .tag-list");
+        if(list.length > 0){
+            list.forEach(el => el.addEventListener("click", (e) => closeSearch()))
+        }
+    }
+
+    addEventTagList()
+
     const searchFnOnce = () => {
         $searchMask.addEventListener("click", closeSearch);
         utils.addEventListenerPjax(document.querySelector("#local-search .search-close-button"), "click", closeSearch);