From d404e93c261f374f9c01ca8b53e620e9cf8c58bc Mon Sep 17 00:00:00 2001
From: XPoet <i@xpoet.cn>
Date: Thu, 27 Oct 2022 15:06:16 +0800
Subject: [PATCH] build(config): change scroll.progress_bar and scroll.percent
 enable mode

---
 _config.yml                                  | 6 ++----
 layout/_partial/header.ejs                   | 7 ++++---
 layout/_partial/progress-bar.ejs             | 2 +-
 layout/_partial/side-tools.ejs               | 4 ++--
 source/css/layout/_partial/progress-bar.styl | 2 +-
 source/css/layout/_partial/side-tools.styl   | 2 +-
 source/js/utils.js                           | 4 ++--
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/_config.yml b/_config.yml
index a15cffd..8376eca 100644
--- a/_config.yml
+++ b/_config.yml
@@ -73,12 +73,10 @@ style:
   # Page scroll style settings
   scroll:
     # Show progress bar in top when page scroll
-    progress_bar:
-      enable: false  # Option values: true | false
+    progress_bar: false # Option values: true | false
 
     # Show percent when page scroll
-    percent:
-      enable: false  # Option values: true | false
+    percent: false      # Option values: true | false
 
 # ---------------------------------------------------------------------------------------
 # Navigation menu
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index a160755..564d4fe 100644
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -3,6 +3,7 @@ const { title: bi_title, logo_img: bi_logo_img } = theme.base_info
 const { logo: s_logo, first_screen: s_first_screen } = theme.style
 const { enable: s_fs_enable, header_transparent: s_fs_header_transparent } = s_first_screen
 const { title: config_title } = config
+const { enable: local_search_enable } = theme.local_search
 %>
 <header class="header-wrapper<%= s_fs_enable === true && is_home() && s_fs_header_transparent ? ' transparent-1' : '' %>">
 
@@ -21,7 +22,7 @@ const { title: config_title } = config
         <div class="right">
             <div class="pc">
                 <ul class="menu-list">
-                    <% for (let i in theme.menu) { %>
+                    <% for (const i in theme.menu) { %>
                         <li class="menu-item">
                             <a class="<%- isInHomePaging(page.path, theme.menu[i]) ? 'active' : is_current(theme.menu[i]) ? 'active' : '' %>"
                                href="<%- url_for(theme.menu[i]) %>"
@@ -30,7 +31,7 @@ const { title: config_title } = config
                             </a>
                         </li>
                     <% } %>
-                    <% if (theme.local_search.enable === true) { %>
+                    <% if (local_search_enable === true) { %>
                         <li class="menu-item search search-popup-trigger">
                             <i class="fas fa-search"></i>
                         </li>
@@ -38,7 +39,7 @@ const { title: config_title } = config
                 </ul>
             </div>
             <div class="mobile">
-                <% if (theme.local_search.enable === true) { %>
+                <% if (local_search_enable === true) { %>
                     <div class="icon-item search search-popup-trigger"><i class="fas fa-search"></i></div>
                 <% } %>
                 <div class="icon-item menu-bar">
diff --git a/layout/_partial/progress-bar.ejs b/layout/_partial/progress-bar.ejs
index 7e09698..6eb3cdc 100644
--- a/layout/_partial/progress-bar.ejs
+++ b/layout/_partial/progress-bar.ejs
@@ -1,5 +1,5 @@
 <div class="progress-bar-container">
-    <% if (theme.style.scroll.progress_bar.enable === true) { %>
+    <% if (theme.style.scroll.progress_bar === true) { %>
         <span class="scroll-progress-bar"></span>
     <% } %>
 
diff --git a/layout/_partial/side-tools.ejs b/layout/_partial/side-tools.ejs
index f7cc8f7..d2a4da7 100644
--- a/layout/_partial/side-tools.ejs
+++ b/layout/_partial/side-tools.ejs
@@ -24,7 +24,7 @@
             </li>
         <% } %>
 
-        <% if (theme.style.scroll.percent.enable !== true) { %>
+        <% if (theme.style.scroll.percent !== true) { %>
             <li class="tools-item tool-scroll-to-top flex-center">
                 <i class="fas fa-arrow-up"></i>
             </li>
@@ -39,7 +39,7 @@
         <li class="tools-item tool-toggle-show flex-center">
             <i class="fas fa-cog fa-spin"></i>
         </li>
-        <% if (theme.style.scroll.percent.enable === true) { %>
+        <% if (theme.style.scroll.percent === true) { %>
             <li class="tools-item tool-scroll-to-top flex-center">
                 <i class="arrow-up fas fa-arrow-up"></i>
                 <span class="percent"></span>
diff --git a/source/css/layout/_partial/progress-bar.styl b/source/css/layout/_partial/progress-bar.styl
index c13a943..22d6d42 100644
--- a/source/css/layout/_partial/progress-bar.styl
+++ b/source/css/layout/_partial/progress-bar.styl
@@ -48,7 +48,7 @@
     }
   }
 
-  if (hexo-config('style.scroll.progress_bar.enable') == true) {
+  if (hexo-config('style.scroll.progress_bar') == true) {
 
     .scroll-progress-bar {
       position absolute
diff --git a/source/css/layout/_partial/side-tools.styl b/source/css/layout/_partial/side-tools.styl
index c88683b..ada8232 100644
--- a/source/css/layout/_partial/side-tools.styl
+++ b/source/css/layout/_partial/side-tools.styl
@@ -70,7 +70,7 @@ $tools-item-border-radius = 0.1rem
 
   .exposed-tools-list {
 
-    if (hexo-config('style.scroll.percent.enable') == true) {
+    if (hexo-config('style.scroll.percent') == true) {
       .tool-scroll-to-top {
         display none
 
diff --git a/source/js/utils.js b/source/js/utils.js
index 98c7114..831c71e 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -23,8 +23,8 @@ KEEP.initUtils = () => {
 
     initData() {
       const { scroll, first_screen } = KEEP.theme_config.style
-      this.isHasScrollProgressBar = scroll.progress_bar.enable === true
-      this.isHasScrollPercent = scroll.percent.enable === true
+      this.isHasScrollProgressBar = scroll.progress_bar === true
+      this.isHasScrollPercent = scroll.percent === true
       const { enable, header_transparent } = first_screen
       this.isHeaderTransparent = enable === true && header_transparent === true
     },