Merge remote-tracking branch 'origin/main' into main

README.md

@@ -15,7 +15,7 @@
 <!-- 快捷导航 -->
 <p align="center">
 
-[主题预览](#-预览) | [快速上手](#-安装) | [使用文档](https://docs.liuzhihang.com) | [加入我们](#-讨论)
+[主题预览](#-预览) | [快速上手](#-安装) | [使用文档](https://www.yuque.com/liuzhihangs/halo-theme-hao) | [加入我们](#-讨论)
 
 </p>
 </div>

templates/assets/js/heo.js

@@ -77,7 +77,9 @@ var heo = {
             htmlText += `<a class='footer-item' href='${item.spec.url}'  target="_blank" rel="noopener nofollow">${item.spec.displayName}</a>`;
         }
         htmlText += `<a class='footer-item' href='${linksUrl}'>更多</a>`
-        document.getElementById("friend-links-in-footer").innerHTML = htmlText;
+        if(document.getElementById("friend-links-in-footer")){
+            document.getElementById("friend-links-in-footer").innerHTML = htmlText;
+        }
     },
 
     //禁止图片右键单击

templates/assets/zhheo/blogex.js

@@ -647,24 +647,25 @@ function listenToPageInputPress() {
 function initBlog() {
     // 图片主色
     GLOBAL_CONFIG.source.post.dynamicBackground && coverColor(),
-        percent(),
-        heo.topCategoriesBarScroll(),
-        heo.initIndexEssay(),
-        setBodyDataType(),
-        listenToPageInputPress(),
-        heo.topPostScroll(),
-        heo.sayhi(),
-        heo.qrcodeCreate(),
-        //右下角 snackbar 弹窗
+    percent(),
+    heo.topCategoriesBarScroll(),
+    heo.initIndexEssay(),
+    setBodyDataType(),
+    listenToPageInputPress(),
+    heo.topPostScroll(),
+    heo.sayhi(),
+    heo.qrcodeCreate(),
+    //右下角 snackbar 弹窗
     GLOBAL_CONFIG.source.tool.switch && heo.hidecookie(),
-        heo.stopImgRightDrag(),
-        heo.onlyHome(),
-        heo.addNavBackgroundInit(),
-        heo.darkModeStatus(),
-        heo.initThemeColor(),
-        //隐藏加载动画
+    heo.stopImgRightDrag(),
+    heo.onlyHome(),
+    heo.addNavBackgroundInit(),
+    heo.reflashEssayWaterFall(),
+    heo.darkModeStatus(),
+    heo.initThemeColor(),
+    //隐藏加载动画
     GLOBAL_CONFIG.loadingBox &&  heo.hideLoading(),
-        checkUrlAndAddHideBanner()
+    checkUrlAndAddHideBanner()
 }
 
 // 如果当前页有评论就执行函数
@@ -863,9 +864,5 @@ document.addEventListener('pjax:send', function () {
 })
 
 document.addEventListener('DOMContentLoaded', function () {
-    //页脚友联
-    if(GLOBAL_CONFIG.isFriendLinksInFooter){
-        heo.addFriendLinksInFooter()
-    }
     heo.reflashEssayWaterFall()
 })

templates/modules/layouts/layout.html

@@ -220,10 +220,7 @@
         removeLoading();
     }
     //页脚友联
-    if(GLOBAL_CONFIG.isFriendLinksInFooter){
-        heo.addFriendLinksInFooter()
-    }
-
+    GLOBAL_CONFIG.isFriendLinksInFooter && heo.addFriendLinksInFooter()
     //音乐页面切换歌曲调用
     if(GLOBAL_CONFIG.isMusic){
         heo.changeMusicBg(false);