Move some properties to dataset

MrWillCom · Aug 27, 2024 · 63d82f6 · 63d82f6
1 parent 8945ad3
commit 63d82f6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.changeset/dull-masks-provide.md b/.changeset/dull-masks-provide.md
@@ -0,0 +1,5 @@
+---
+'hexo-theme-cupertino': minor
+---
+
+Move the exported configurations in the global object called `ThemeCupertino` to the dataset of body.
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
@@ -114,14 +114,7 @@
   <% if (page.type == 'categories') { %>
   <%- css('css/categories') %>
   <% } %>
-  <script>
-    ThemeCupertino = {}
-  </script>
   <% if (theme.scroll_reveal) { %>
-  <script>
-    ThemeCupertino['scrollRevealDisappear'] = <%- JSON.stringify(theme.scroll_reveal_disappear) %>
-    ThemeCupertino['scrollRevealQuery'] = <%- JSON.stringify(theme.scroll_reveal_query) %>
-  </script>
   <%- css('css/scroll-reveal') %>
   <% } %>
   <% if (theme.view_transition) { %>
@@ -147,5 +140,6 @@
   <link rel="stylesheet" href="<%- getCdnUrl('@waline/client', 'v2', 'dist/waline.css') %>" />
   <% } %>
 
+  <script>var ThemeCupertino = {}</script>
   <%- theme.insertions.head.ending %>
 </head>
diff --git a/layout/layout.ejs b/layout/layout.ejs
@@ -18,6 +18,10 @@
     <% if (theme.search == true && page.type == 'search') { %>
     data-search-path="<%= theme.search_path %>"
     <% } %>
+    <% if (theme.scroll_reveal) { %>
+    data-scroll-reveal-disappear="<%= theme.scroll_reveal_disappear %>"
+    data-scroll-reveal-query="<%= theme.scroll_reveal_query %>"
+    <% } %>
   >
     <a href="#main-content" id="skip-to-content"><%- __('skip_to_content') %></a>
     <%- partial('_partial/nav') %>

diff --git a/source/js/scroll-reveal.js b/source/js/scroll-reveal.js
@@ -7,16 +7,18 @@ ThemeCupertino['ScrollReveal'] = new (class {
       entries.forEach(entry => {
         if (entry.isIntersecting) {
           entry.target.classList.add('scroll-reveal-show')
-        } else if (ThemeCupertino.scrollRevealDisappear) {
+        } else if (document.body.dataset.scrollRevealDisappear) {
           entry.target.classList.remove('scroll-reveal-show')
         }
       })
     })
 
-    document.querySelectorAll(ThemeCupertino.scrollRevealQuery).forEach(el => {
-      el.classList.add('scroll-reveal')
-      this.observer.observe(el)
-    })
+    document
+      .querySelectorAll(document.body.dataset.scrollRevealQuery)
+      .forEach(el => {
+        el.classList.add('scroll-reveal')
+        this.observer.observe(el)
+      })
   }
 
   /**