hexo-theme-solitude 1.7.9 → 1.7.11

package/_config.yml

@@ -811,30 +811,35 @@ google_adsense:
 right_menu:
   enable: false
   commentBarrage: false # 是否显示热评开关 / Whether to display the hot comment switch.
-  translate: # 翻译功能（仅支持简繁）/ Translation function (Simplified and Traditional Chinese only)
+  # 翻译功能（仅支持简繁）
+  # Translation function (Simplified and Traditional Chinese only)
+  translate: 
     enable: false
     defaultEncoding: 2 # 1: 默认繁体 2: 默认简体
-    translateDelay: 0 # 翻译迟疑时间
-  # 自定义菜单项列表 / Customize the list of menu items.
+    translateDelay: 0 # 首次加载翻译迟疑时间
+  # 自定义菜单项列表
+  # Customize the list of menu items.
   custom_list:
   #  - name: 随机短文
-  #    url:
   #    click: toRandomPost()
   #    id: menu-randomPost
   #    class:
   #    icon: st-signal-tower-fill
   #  - name: 全部分类
-  #    url: /categories/
-  #    click:
+  #    click: pjax.loadUrl('/categories/') # 外链用 window.open，pjax 无法请求跨域内容
   #    id:
   #    class:
   #    icon: st-checkbox-multiple-blank-fill
   #  - name: 全部标签
-  #    url: /tags/
-  #    click:
+  #    click: pjax.loadUrl('/tags/')
   #    id:
   #    class:
   #    icon: st-price-tag-fill
+  #  - name: 赞助主题
+  #    click: window.open('https://afdian.net/a/efu0u0/', '_blank')
+  #    id:
+  #    class:
+  #    icon: st-afdian-line
 
 # CDN
 # Don't modify the following settings unless you know how they work

package/layout/includes/inject/body.pug

@@ -13,6 +13,8 @@ mixin katex
 div
     script(src=url_for(theme.cdn.main))
     script(src=url_for(theme.cdn.utils))
+    script(src=url_for(theme.cdn.waterfall))
+    script(src=url_for(theme.cdn.pjax))
 
     if theme.comment.enable && theme.comment.type === 'valine'
         // md5
@@ -35,7 +37,6 @@ div
         else if page.katex
             +katex
 
-    script(src=url_for(theme.cdn.pjax))
     if theme.lazyload.enable
         script(src=url_for(theme.cdn.lazyload))
     script(src=url_for(theme.cdn.snackbar))
@@ -68,9 +69,6 @@ div
                     }
                 script(src=url_for(theme.cdn.cover_api))
 
-    if theme.says.enable
-        script(src=url_for(theme.cdn.waterfall))
-
     if theme.comment.enable
         case theme.comment.type
             when 'twikoo'

package/layout/includes/inject/head.pug

@@ -111,7 +111,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.9",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.11",
         "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/rightmenu.pug

@@ -52,7 +52,7 @@ div#rightMenu
                 span= _p('right_menu.music.copyMusicName')
     div.rightMenu-group.rightMenu-line.rightMenuOther
         each item,index in custom_list
-            a.rightMenu-item(id=item.id class=item.class href=item.href onclick=item.click)
+            div.rightMenu-item(id=item.id class=item.class onclick=item.click+'||rm.hideRightMenu()')
                 i.solitude(class=item.icon)
                 span= item.name
     div.rightMenu-group.rightMenu-line.rightMenuOther

package/package.json

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

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/_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();
     })
 }
 
@@ -329,14 +329,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 +458,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 +824,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 +846,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()
 }