From d2b7a5885ad25df36a4f2503377cfdd2c92888e4 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Thu, 7 Sep 2023 22:14:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E7=B9=81=E8=BD=AC=E6=8D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/assets/js/tw_cn.js                                | 2 +-
 templates/assets/zhheo/blogex.js                            | 1 +
 templates/assets/{libs/twikoo => zhheo}/commentBarrage.css  | 0
 templates/assets/{libs/twikoo => zhheo}/commentBarrage.js   | 0
 .../assets/{libs/twikoo => zhheo}/commentBarrage.min.css    | 0
 templates/modules/head.html                                 | 6 +++---
 templates/modules/layouts/layout.html                       | 5 ++++-
 templates/modules/right-menu.html                           | 6 +-----
 templates/modules/widgets/console.html                      | 1 -
 9 files changed, 10 insertions(+), 11 deletions(-)
 rename templates/assets/{libs/twikoo => zhheo}/commentBarrage.css (100%)
 rename templates/assets/{libs/twikoo => zhheo}/commentBarrage.js (100%)
 rename templates/assets/{libs/twikoo => zhheo}/commentBarrage.min.css (100%)

diff --git a/templates/assets/js/tw_cn.js b/templates/assets/js/tw_cn.js
index 1a4591bd..a8211d70 100644
--- a/templates/assets/js/tw_cn.js
+++ b/templates/assets/js/tw_cn.js
@@ -56,7 +56,7 @@ document.addEventListener("DOMContentLoaded", function () {
         }
     }
     function translatePage() {
-        if (rm) rm.hideRightMenu();
+        if (rm && GLOBAL_CONFIG.rightMenuEnable) rm.hideRightMenu();
         if (targetEncoding === 1) {
             currentEncoding = 1;
             targetEncoding = 2;
diff --git a/templates/assets/zhheo/blogex.js b/templates/assets/zhheo/blogex.js
index 8946cbd6..0363101e 100644
--- a/templates/assets/zhheo/blogex.js
+++ b/templates/assets/zhheo/blogex.js
@@ -617,6 +617,7 @@ function listenToPageInputPress() {
 function initBlog() {
     // 图片主色
     GLOBAL_CONFIG.source.post.dynamicBackground && coverColor(),
+    GLOBAL_CONFIG.rightMenuEnable && addRightMenuClickEvent(),
     percent(),
     heo.topCategoriesBarScroll(),
     heo.initIndexEssay(),
diff --git a/templates/assets/libs/twikoo/commentBarrage.css b/templates/assets/zhheo/commentBarrage.css
similarity index 100%
rename from templates/assets/libs/twikoo/commentBarrage.css
rename to templates/assets/zhheo/commentBarrage.css
diff --git a/templates/assets/libs/twikoo/commentBarrage.js b/templates/assets/zhheo/commentBarrage.js
similarity index 100%
rename from templates/assets/libs/twikoo/commentBarrage.js
rename to templates/assets/zhheo/commentBarrage.js
diff --git a/templates/assets/libs/twikoo/commentBarrage.min.css b/templates/assets/zhheo/commentBarrage.min.css
similarity index 100%
rename from templates/assets/libs/twikoo/commentBarrage.min.css
rename to templates/assets/zhheo/commentBarrage.min.css
diff --git a/templates/modules/head.html b/templates/modules/head.html
index 7ae1f468..5eeddbe3 100644
--- a/templates/modules/head.html
+++ b/templates/modules/head.html
@@ -20,7 +20,7 @@
 
     <link rel="stylesheet" th:href="${assets_link + '/zhheo/custom.css' + theme_version}">
 
-    <link rel="stylesheet" th:href="${assets_link + '/libs/twikoo/commentBarrage.css'}">
+    <link rel="stylesheet" th:href="${assets_link + '/zhheo/commentBarrage.css'}">
 
     <style th:if="${theme.config.other.scrollbarLinearGradientEnable}">
         *::-webkit-scrollbar-thumb {
@@ -262,8 +262,8 @@
             translate: {
                 defaultEncoding:[[${theme.config.style.translate.defaultEncoding}]],
                 translateDelay:0,
-                msgToTraditionalChinese:"简",
-                msgToSimplifiedChinese:"繁",
+                msgToTraditionalChinese:"繁",
+                msgToSimplifiedChinese:"简",
                 rightMenuMsgToTraditionalChinese:"轉為繁體",
                 rightMenuMsgToSimplifiedChinese:"转为简体"
             },
diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html
index 39751db9..441acb18 100644
--- a/templates/modules/layouts/layout.html
+++ b/templates/modules/layouts/layout.html
@@ -90,11 +90,14 @@
     <!-- swiper 在瞬间滚动时会使用 -->
     <script data-pjax  src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/Swiper/6.6.2/swiper-bundle.min.js"></script>
 
+    <!-- 右键菜单 -->
+    <script th:if="${theme.config.tool.rightMenu.rightMenuEnable}" th:src="${assets_link + '/zhheo/rightmenu.js'}"></script>
+
     <!-- 评论弹幕 -->
     <script  th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') &&
         not #strings.isEmpty(theme.config.comments.twikoos.envId) &&
         not #strings.isEmpty(theme.config.comments.twikoos.accessToken)}"  data-pjax=""
-             th:src="${assets_link + '/libs/twikoo/commentBarrage.js'}"></script>
+             th:src="${assets_link + '/zhheo/commentBarrage.js'}"></script>
 
     <!-- Tocbot 目录生成 start -->
     <th:block th:replace="~{modules/common/toc-bot :: toc-bot}"></th:block>
diff --git a/templates/modules/right-menu.html b/templates/modules/right-menu.html
index 55af3a2e..c3525064 100644
--- a/templates/modules/right-menu.html
+++ b/templates/modules/right-menu.html
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 右键菜单 -->
-<div th:fragment="right-menu" th:if="${theme.config.tool.rightMenu.rightMenuEnable}">
-    <script th:src="${assets_link + '/zhheo/rightmenu.js'}"></script>
+<div class="js-pjax" th:fragment="right-menu" th:if="${theme.config.tool.rightMenu.rightMenuEnable}">
     <div id="rightMenu">
         <div class="rightMenu-group rightMenu-small">
             <div class="rightMenu-item" id="menu-backward"><i class="haofont hao-icon-arrow-left"></i></div>
@@ -119,9 +118,6 @@
         </div>
     </div>
     <div id="rightmenu-mask"></div>
-    <script>
-        addRightMenuClickEvent();
-    </script>
 </div>
 
 </html>
\ No newline at end of file
diff --git a/templates/modules/widgets/console.html b/templates/modules/widgets/console.html
index e633cfa5..def9f73c 100644
--- a/templates/modules/widgets/console.html
+++ b/templates/modules/widgets/console.html
@@ -114,7 +114,6 @@
   </div>
   <div class="button-group">
     <div class="console-btn-item">
-      <!-- 用到了 rightmenu.js 的功能，还需要调整 -->
       <a class="darkmode_switchbutton" href="javascript:void(0);" onclick="navFn.switchDarkMode();" rel="external nofollow"
          title="显示模式切换"><i class="haofont hao-icon-moon" style="font-size:1rem"></i>
       </a>