hexo-theme-stellar 1.40.0 → 1.41.0

package/source/js/tagtree.js

@@ -0,0 +1,29 @@
+(() => {
+  const tagtreeConf = window.__STELLAR_TAGTREE__ || {};
+
+  const tagSwitchers = document.querySelectorAll('.tag-subtree.parent-tag > a > .tag-switcher-wrapper')
+  for (const tagSwitcher of tagSwitchers) {
+    tagSwitcher.addEventListener('click', (e) => {
+      const parent = e.target.closest('.tag-subtree.parent-tag')
+      parent.classList.toggle('expanded')
+      e.preventDefault()
+    })
+  }
+
+  // Get active tag from query string, then activate it.
+  const urlParams = new URLSearchParams(window.location.search)
+  const activeTag = urlParams.get('tag')
+  if (activeTag) {
+    let tag = document.querySelector(`.tag-subtree[data-tag="${activeTag}"]`)
+    if (tag) {
+      tag.querySelector('a').classList.add('active')
+      if (!tagtreeConf.expand_active) {
+        tag = tag.parentElement.closest('.tag-subtree.parent-tag')
+      }
+      while (tag) {
+        tag.classList.add('expanded')
+        tag = tag.parentElement.closest('.tag-subtree.parent-tag')
+      }
+    }
+  }
+})()

package/source/js/theme.js

@@ -0,0 +1,61 @@
+const applyTheme = (theme) => {
+  if (theme === 'auto') {
+    document.documentElement.removeAttribute('data-theme')
+  } else {
+    document.documentElement.setAttribute('data-theme', theme)
+  }
+
+  // applyThemeToGiscus(theme)
+}
+
+// FIXME: 这会导致无法使用 preferred_color_scheme 以外的主题
+const applyThemeToGiscus = (theme) => {
+  // theme = theme === 'auto' ? 'preferred_color_scheme' : theme
+  const cmt = document.getElementById('giscus')
+  if (cmt) {
+    // This works before giscus load.
+    cmt.setAttribute('data-theme', theme)
+  }
+
+  const iframe = document.querySelector('#comments > section.giscus > iframe')
+  if (iframe) {
+    // This works after giscus loaded.
+    const src = iframe.src
+    const newSrc = src.replace(/theme=[\w]+/, `theme=${theme}`)
+    iframe.src = newSrc
+  }
+}
+
+const switchTheme = () => {
+  // light -> dark -> auto -> light -> ...
+  const currentTheme = document.documentElement.getAttribute('data-theme')
+  let newTheme;
+  switch (currentTheme) {
+    case 'light':
+      newTheme = 'dark'
+      break
+    case 'dark':
+      newTheme = 'auto'
+      break
+    default:
+      newTheme = 'light'
+  }
+  applyTheme(newTheme)
+  window.localStorage.setItem('Stellar.theme', newTheme)
+  utils.dark.mode = newTheme === 'auto' ? (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light") : newTheme;
+  utils.dark.method.toggle.start();
+
+  const messages = window.__STELLAR_I18N__ || {};
+  hud?.toast?.(messages[newTheme])
+}
+
+(() => {
+  // Apply user's preferred theme, if any.
+  const theme = window.localStorage.getItem('Stellar.theme')
+  if (theme !== null) {
+    applyTheme(theme)
+  } else {
+    utils.dark.mode = window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+  }
+  utils.dark.method.toggle.start();
+})()

package/{layout/_partial/scripts/utils.ejs → source/js/utils.js}

@@ -1,4 +1,3 @@
-<script type="text/javascript">
   
   function RunItem() {
     this.list = []; // 存放回调函数
@@ -63,7 +62,7 @@
       var sheets = doc.styleSheets;
       if (attributes) {
         for (var attributeName in attributes) {
-          if (attributes.hasOwnProperty(attributeName)) {
+          if (Object.prototype.hasOwnProperty.call(attributes, attributeName)) {
             ss.setAttribute(attributeName, attributes[attributeName]);
           }
         }
@@ -296,7 +295,7 @@
     onLoading: (el) => {
       if (el) {
         if (el.querySelector('.loading-wrap') === null) {
-          el.insertAdjacentHTML('beforeend', '<div class="loading-wrap"><svg xmlns="http://www.w3.org/2000/svg" width="2em" height="2em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-width="2"><path stroke-dasharray="60" stroke-dashoffset="60" stroke-opacity=".3" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="1.3s" values="60;0"/></path><path stroke-dasharray="15" stroke-dashoffset="15" d="M12 3C16.9706 3 21 7.02944 21 12"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="15;0"/><animateTransform attributeName="transform" dur="1.5s" repeatCount="indefinite" type="rotate" values="0 12 12;360 12 12"/></path></g></svg></div>');
+          el.insertAdjacentHTML('beforeend', `<div class="loading-wrap">${ctx.icons['default:loading-spinner']}</div>`);
         }
       }
     },
@@ -312,7 +311,7 @@
         if (wrap) {
           var svg = wrap.querySelector('svg');
           if (svg) svg.remove();
-          wrap.insertAdjacentHTML('beforeend', '<svg xmlns="http://www.w3.org/2000/svg" width="2em" height="2em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path stroke-dasharray="60" stroke-dashoffset="60" d="M12 3L21 20H3L12 3Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.5s" values="60;0"/></path><path stroke-dasharray="6" stroke-dashoffset="6" d="M12 10V14"><animate fill="freeze" attributeName="stroke-dashoffset" begin="0.6s" dur="0.2s" values="6;0"/></path></g><circle cx="12" cy="17" r="1" fill="currentColor" fill-opacity="0"><animate fill="freeze" attributeName="fill-opacity" begin="0.8s" dur="0.4s" values="0;1"/></circle></svg>');
+          wrap.insertAdjacentHTML('beforeend', ctx.icons['default:warning']);
           wrap.classList.add('error');
         }
       }
@@ -533,11 +532,13 @@
             if (timedOut) return;
             // 标记元素实例为已加载
             if (el) utils._loadedElements.add(el);
-            // 写入缓存（克隆响应，避免影响回调读取；延迟执行，避免阻塞渲染）
+            // 写入缓存：回调会立即消费 data 的 body，必须先同步 clone 再延迟读取
             if (cacheable && data.ok) {
+              const cacheClone = data.clone();
+              const contentType = data.headers.get('Content-Type') || 'application/json';
               utils._defer(() => {
-                data.clone().text().then(text => {
-                  utils.cache.set(url, text, data.headers.get('Content-Type') || 'application/json', ttl);
+                cacheClone.text().then(text => {
+                  utils.cache.set(url, text, contentType, ttl);
                 }).catch(() => {});
               });
             }
@@ -609,9 +610,12 @@
               clearTimeout(timer);
               if (timedOut) return;
               if (cacheable) {
+                // 调用方会消费 resp 的 body，必须先同步 clone 再延迟读取
+                const cacheClone = resp.clone();
+                const contentType = resp.headers.get('Content-Type') || 'application/json';
                 utils._defer(() => {
-                  resp.clone().text().then(text => {
-                    utils.cache.set(url, text, resp.headers.get('Content-Type') || 'application/json', ttl);
+                  cacheClone.text().then(text => {
+                    utils.cache.set(url, text, contentType, ttl);
                   }).catch(() => {});
                 });
               }
@@ -722,4 +726,3 @@
   utils.dark = Object.assign(utils.dark, {
     push: utils.dark.method.toggle.push,
   });
-</script>

package/layout/_partial/scripts/services.ejs

@@ -1,178 +0,0 @@
-<script defer>
-  const initServices = () => {
-    // 用于存储需要清理的资源
-    let timers = [];
-    
-    ctx.services = Object.assign({}, JSON.parse(`<%- JSON.stringify(theme.data_services) %>`));
-    for (let id of Object.keys(ctx.services)) {
-      const js = ctx.services[id].js;
-      if (id == 'siteinfo') {
-        const cardlinks = document.querySelectorAll('a.link-card[cardlink]');
-        if (cardlinks?.length > 0) {
-          utils.js(js, { defer: true }).then(function () {
-            setCardLink(cardlinks);
-          });
-        }
-      } else if (id == 'ghinfo') {
-        const els = document.querySelectorAll('.ds-ghinfo');
-        if (els.length > 0) {
-          utils.js(js, { defer: true });
-        }
-      } else if (id == 'voice') {
-        const voiceAudios = document.querySelectorAll('.voice>audio');
-        if (voiceAudios?.length > 0) {
-          utils.js(js, { defer: true }).then(function () {
-            createVoiceDom(voiceAudios);
-          });
-        }
-      } else if (id == 'video') {
-        const videos = document.querySelectorAll('.video>video');
-        if (videos?.length > 0) {
-          utils.js(js, { defer: true }).then(function () {
-            videoEvents(videos);
-          });
-        }
-      } else if (id == 'download-file') {
-        const files = document.querySelectorAll('.chat-file');
-        if (files?.length > 0) {
-          utils.js(js, { defer: true }).then(function () {
-            downloadFileEvent(files);
-          });
-        }
-      } else {
-        const els = document.getElementsByClassName(`ds-${id}`);
-        if (els?.length > 0) {
-          if (id == 'timeline' || id == 'memos' || id == 'marked' || id == 'mdrender') {
-            utils.js(deps.marked).then(function () {
-              utils.js(js, { defer: true });
-            });
-          } else {
-            utils.js(js, { defer: true });
-          }
-        }
-      }
-    }
-
-    // search
-    if (ctx.search && typeof searchFunc === 'function') {
-      const inputArea = document.querySelector("input#search-input");
-      if (inputArea && !inputArea._searchInitialized) {
-        const path = ctx.search.path.startsWith('/') ? ctx.root + ctx.search.path.substring(1) : ctx.root + ctx.search.path;
-        const filter = inputArea.getAttribute('data-filter') || '';
-        searchFunc(path, filter, 'search-wrapper', 'search-input', 'search-result');
-        // 标记为已初始化，防止重复绑定
-        inputArea._searchInitialized = true;
-      }
-    }
-
-    // chat iphone time
-    let phoneTimes = document.querySelectorAll('.chat .status-bar .time');
-    let firstAdjustInterval = null;
-    let mainInterval = null;
-
-    if (phoneTimes.length > 0) {
-      NowTime();
-      const date = new Date();
-      const sec = date.getSeconds();
-      firstAdjustInterval = setInterval(firstAdjustTime, 1000 * (60 - sec));
-      timers.push(firstAdjustInterval);
-
-      function firstAdjustTime() {
-        NowTime();
-        if (firstAdjustInterval) {
-          clearInterval(firstAdjustInterval);
-          firstAdjustInterval = null;
-        }
-        mainInterval = setInterval(NowTime, 1000 * 60);
-        timers.push(mainInterval);
-      }
-
-      function NowTime() {
-        for (let i = 0; i < phoneTimes.length; ++i) {
-          const timeSpan = phoneTimes[i];
-          const date = new Date();
-          const hour = date.getHours();
-          const min = date.getMinutes();
-          timeSpan.innerHTML = check(hour) + ":" + check(min);
-        }
-      };
-
-      function check(val) {
-        if (val < 10) {
-          return ("0" + val);
-        }
-        return (val);
-      }
-    }
-
-    // chat quote - 存储事件监听器以便清理
-    const quoteClickHandlers = new Map();
-    const chat_quote_obverser = new IntersectionObserver((entries, observer) => {
-      entries.filter((entry) => { return entry.isIntersecting }).sort((a, b) => a.intersectionRect.y !== b.intersectionRect.y ? a.intersectionRect.y - b.intersectionRect.y : a.intersectionRect.x - b.intersectionRect.x).forEach((entry, index) => {
-          observer.unobserve(entry.target);
-          setTimeout(() => {
-            entry.target.classList.add('quote-blink');
-            setTimeout(() => {
-              entry.target.classList.remove('quote-blink');
-            }, 1000);
-          }, Math.max(100, 16) * (index + 1));
-        });
-    });
-
-    var chatQuotes = document.querySelectorAll(".chat .talk .quote");
-    chatQuotes.forEach((quote) => {
-      const handler = function () {
-        var chatCellDom = document.getElementById("quote-" + quote.getAttribute("quotedCellTag"));
-        if (chatCellDom) {
-          var chatDiv = chatCellDom.parentElement;
-          var mid = chatDiv.clientHeight / 2;
-          var offsetTop = chatCellDom.offsetTop;
-          if (offsetTop > mid - chatCellDom.clientHeight / 2) {
-            chatDiv.scrollTo({
-              top: chatCellDom.offsetTop - mid + chatCellDom.clientHeight / 2,
-              behavior: "smooth"
-            });
-          } else {
-            chatDiv.scrollTo({
-              top: 0,
-              behavior: "smooth"
-            });
-          }
-          chat_quote_obverser.observe(chatCellDom);
-        }
-      };
-      quote.addEventListener('click', handler);
-      quoteClickHandlers.set(quote, handler); // 保存处理器引用
-    });
-
-    // 返回清理函数，用于清理定时器和观察器
-    return () => {
-      // 清理所有定时器（包括可能未完成的 firstAdjustInterval）
-      timers.forEach(timer => {
-        if (timer) clearInterval(timer);
-      });
-      timers = [];
-      if (firstAdjustInterval) {
-        clearInterval(firstAdjustInterval);
-        firstAdjustInterval = null;
-      }
-      if (mainInterval) {
-        clearInterval(mainInterval);
-        mainInterval = null;
-      }
-      
-      // 断开观察器
-      if (chat_quote_obverser) {
-        chat_quote_obverser.disconnect();
-      }
-      
-      // 移除所有 click 事件监听器
-      quoteClickHandlers.forEach((handler, quote) => {
-        quote.removeEventListener('click', handler);
-      });
-      quoteClickHandlers.clear();
-    };
-  };
-
-  utils.initPlugin(initServices, 'services');
-</script>

package/layout/_partial/scripts/sidebar.ejs

@@ -1,25 +0,0 @@
-<script>
-  const sidebar = {
-    leftbar: () => {
-      if (l_body) {
-        l_body.toggleAttribute('leftbar');
-        l_body.removeAttribute('rightbar');
-      }
-    },
-    rightbar: () => {
-      if (l_body) {
-        l_body.toggleAttribute('rightbar');
-        l_body.removeAttribute('leftbar');
-      }
-    },
-    dismiss: () => {
-      if (l_body) {
-        l_body.removeAttribute('leftbar');
-        l_body.removeAttribute('rightbar');
-      }
-    },
-    toggleTOC: () => {
-      document.querySelector('#data-toc').classList.toggle('collapse');
-    }
-  }
-</script>

package/layout/_partial/scripts/tagtree.ejs

@@ -1,29 +0,0 @@
-<script type="text/javascript">
-  (() => {
-    const tagSwitchers = document.querySelectorAll('.tag-subtree.parent-tag > a > .tag-switcher-wrapper')
-    for (const tagSwitcher of tagSwitchers) {
-      tagSwitcher.addEventListener('click', (e) => {
-        const parent = e.target.closest('.tag-subtree.parent-tag')
-        parent.classList.toggle('expanded')
-        e.preventDefault()
-      })
-    }
-
-    // Get active tag from query string, then activate it.
-    const urlParams = new URLSearchParams(window.location.search)
-    const activeTag = urlParams.get('tag')
-    if (activeTag) {
-      let tag = document.querySelector(`.tag-subtree[data-tag="${activeTag}"]`)
-      if (tag) {
-        tag.querySelector('a').classList.add('active')
-        <% if (!theme.widgets.tagtree.expand_active) { %>
-          tag = tag.parentElement.closest('.tag-subtree.parent-tag')
-        <% } %>
-        while (tag) {
-          tag.classList.add('expanded')
-          tag = tag.parentElement.closest('.tag-subtree.parent-tag')
-        }
-      }
-    }
-  })()
-</script>

package/layout/_partial/scripts/theme.ejs

@@ -1,67 +0,0 @@
-<script type="text/javascript">
-  const applyTheme = (theme) => {
-    if (theme === 'auto') {
-      document.documentElement.removeAttribute('data-theme')
-    } else {
-      document.documentElement.setAttribute('data-theme', theme)
-    }
-
-    // applyThemeToGiscus(theme)
-  }
-
-  // FIXME: 这会导致无法使用 preferred_color_scheme 以外的主题
-  const applyThemeToGiscus = (theme) => {
-    // theme = theme === 'auto' ? 'preferred_color_scheme' : theme
-    const cmt = document.getElementById('giscus')
-    if (cmt) {
-      // This works before giscus load.
-      cmt.setAttribute('data-theme', theme)
-    }
-
-    const iframe = document.querySelector('#comments > section.giscus > iframe')
-    if (iframe) {
-      // This works after giscus loaded.
-      const src = iframe.src
-      const newSrc = src.replace(/theme=[\w]+/, `theme=${theme}`)
-      iframe.src = newSrc
-    }
-  }
-
-  const switchTheme = () => {
-    // light -> dark -> auto -> light -> ...
-    const currentTheme = document.documentElement.getAttribute('data-theme')
-    let newTheme;
-    switch (currentTheme) {
-      case 'light':
-        newTheme = 'dark'
-        break
-      case 'dark':
-        newTheme = 'auto'
-        break
-      default:
-        newTheme = 'light'
-    }
-    applyTheme(newTheme)
-    window.localStorage.setItem('Stellar.theme', newTheme)
-    utils.dark.mode = newTheme === 'auto' ? (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light") : newTheme;
-    utils.dark.method.toggle.start();
-
-    const messages = {
-      light: `<%- __('message.theme_switched.light') %>`,
-      dark: `<%- __('message.theme_switched.dark') %>`,
-      auto: `<%- __('message.theme_switched.auto') %>`,
-    }
-    hud?.toast?.(messages[newTheme])
-  }
-
-  (() => {
-    // Apply user's preferred theme, if any.
-    const theme = window.localStorage.getItem('Stellar.theme')
-    if (theme !== null) {
-      applyTheme(theme)
-    } else {
-      utils.dark.mode = window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
-    }
-    utils.dark.method.toggle.start();
-  })()
-</script>