hexo-theme-volantis 4.2.0 → 5.0.0-alpha.112

package/layout/_partial/scripts/index.ejs

@@ -1,128 +1,144 @@
-<%- partial('loadfunction') %>
+<script>
+  /******************** volantis.dom ********************************/
+  // 页面选择器 将dom对象缓存起来 see: /source/js/app.js etc.
+  volantis.dom.bodyAnchor = volantis.dom.$(document.getElementById("safearea")); // 页面主体
+  volantis.dom.topBtn = volantis.dom.$(document.getElementById('s-top')); // 向上
+  volantis.dom.wrapper = volantis.dom.$(document.getElementById('wrapper')); // 整个导航栏
+  volantis.dom.coverAnchor = volantis.dom.$(document.querySelector('#l_cover .cover-wrapper')); // 1个
+  volantis.dom.switcher = volantis.dom.$(document.querySelector('#l_header .switcher .s-search')); // 搜索按钮   移动端 1个
+  volantis.dom.header = volantis.dom.$(document.getElementById('l_header')); // 移动端导航栏
+  volantis.dom.search = volantis.dom.$(document.querySelector('#l_header .m_search')); // 搜索框 桌面端 移动端 1个
+  volantis.dom.mPhoneList = volantis.dom.$(document.querySelectorAll('#l_header .m-phone .list-v')); //  手机端 子菜单 多个
+</script>
+
 <script>
   <% if (theme.plugins.fontawesome) { %>
-  loadCSS("<%- theme.plugins.fontawesome %>", window.volantis.loadcss);
+  volantis.css("<%- theme.plugins.fontawesome %>");
   <% } %>
   <% if (theme.plugins.fontawesome_animation.enable) { %>
-  loadCSS("<%- theme.plugins.fontawesome_animation.css %>", window.volantis.loadcss);
+  volantis.css("<%- theme.plugins.fontawesome_animation.css %>");
   <% } %>
   <% if (theme.plugins.nodewaves.enable) { %>
-  loadCSS("<%- theme.plugins.nodewaves.css %>", window.volantis.loadcss);
-  <% } %>
-  <% if ((theme.plugins.highlightjs.enable == true)&&(theme.plugins.highlightjs.css)) { %>
-  loadCSS("<%- theme.plugins.highlightjs.css %>", window.volantis.loadcss);
+  volantis.css("<%- theme.plugins.nodewaves.css %>");
   <% } %>
 </script>
+
 <!-- required -->
-<%- js(theme.plugins.jquery) %>
-<%- partial('../../_third-party/fancybox/script') %>
+<% if (theme.plugins.globalJquery) { %>
+  <%- js(theme.plugins.jquery) %>
+<% } %>
 
 <!-- internal -->
-<%- partial('cover') %>
-<% if (theme.rightmenu.enable == true) { %>
-  <%- partial('../rightmenu') %>
+<%- js(theme.cdn.map.js.app) %>
+
+<% if (theme.rightmenu.enable) { %>
+  <%- partial('../../_plugins/rightmenu/layout') %>
 <% } %>
 
-<% if (theme.plugins.issues.enable) { %>
-  <%- partial('../../_third-party/issues/script') %>
+<% if (theme.rightmenus.enable) { %>
+  <%- partial('../../_plugins/rightmenus/layout') %>
 <% } %>
 
-<% if (theme.plugins.lazyload && theme.plugins.lazyload.enable) { %>
-  <%- partial('../../_third-party/lazyload/script') %>
+<!-- rightmenu要在darkmode之前（ToggleButton） darkmode要在comments之前（volantis.dark.push）-->
+<% if (theme.plugins.darkmode.enable) { %>
+  <%- partial('../../_plugins/darkmode/script') %>
 <% } %>
 
-<% if (theme.plugins.preload.enable && theme.plugins.preload.service) { %>
-  <% let preload = theme.plugins.preload; %>
-  <% if (preload.service == 'instant_page') { %>
-    <script async src="<%- preload.instant_page %>" type="module" defer integrity="sha384-OeDn4XE77tdHo8pGtE1apMPmAipjoxUQ++eeJa6EtJCfHlvijigWiJpD7VDPWXV1"></script>
-  <% } else if (preload.service == 'flying_pages') { %>
-    <script>
-      window.FPConfig = {
-        delay: 0,
-        ignoreKeywords: [],
-        maxRPS: 5,
-        hoverDelay: 25
-      };
-    </script>
-    <script defer src="<%- preload.flying_pages %>"></script>
-  <% } %>
+<% if (theme.plugins.sitesjs.enable || theme.plugins.friendsjs.enable || theme.plugins.contributorsjs.enable) { %>
+<%- partial('../../_plugins/github-api/script') %>
 <% } %>
 
+<% if (theme.plugins.lazyload && theme.plugins.lazyload.enable) { %>
+  <%- partial('../../_plugins/lazyload/script') %>
+<% } %>
 
-<% if (theme.plugins.clipboard.enable && (theme.custom_css.body.highlight.copy_btn == true)) { %>
-  <%- partial('../../_third-party/clipboard/script') %>
+<% if (theme.plugins.preload.enable && theme.plugins.preload.service) { %>
+  <%- partial('../../_plugins/preload/script') %>
 <% } %>
 
 <% if (theme.plugins.scrollreveal.enable && theme.plugins.scrollreveal.js) { %>
-   <%- partial('../../_third-party/scrollreveal/script') %>
+   <%- partial('../../_plugins/scrollreveal/script') %>
 <% } %>
 
 <% if (theme.plugins.aplayer && theme.plugins.aplayer.enable && theme.plugins.aplayer.js) { %>
-  <%- partial('../../_third-party/aplayer/script') %>
-<% } %>
+  <%- partial('../../_plugins/aplayer/script') %>
+<% } %>
+
+<%
+  if (theme.comments.service && theme.comments.service.length > 0) {
+    try { %>
+      <%- partial('../../_plugins/comments/' + theme.comments.service + '/script') %>
+    <% } catch (e) {
+      // error friendly
+      console.log(`
+===============================================================================
+    没有找到评论插件：${theme.comments.service}
+    请检查是否存在该插件，或者检查插件名称是否正确：${theme.comments.service}
+    see: https://volantis.js.org/v5/theme-settings/#选择评论系统
+================================================================================
+    There is no comments plugin: ${theme.comments.service}
+    Please check if the plugin exists, or check the plugin name is correct: ${theme.comments.service}
+    see: https://volantis.js.org/v5/theme-settings/#选择评论系统
+=================================================================================`)
+    }
+  }
+%>
+
 
-<% if (theme.comments.service && theme.comments.service.length > 0) { %>
-  <%- partial('../../_third-party/comments/' + theme.comments.service + '/script') %>
-<% } %>
 
 <% if (theme.analytics.busuanzi) { %>
   <script defer src="<%- theme.analytics.busuanzi %>" data-pjax></script>
 <% } %>
-<% if (theme.use_cdn && theme.info.cdn && theme.info.cdn.js) { %>
-  <%- js(theme.info.cdn.js) %>
-<% } else if(theme.use_cdn) { %>
-  <%- js(['https://cdn.jsdelivr.net/npm/hexo-theme-volantis@'+theme.info.theme_version+'/source/js/app.min.js']) %>
-<% } else { %>
-  <%- js(['js/app.js']) %>
-<% } %>
 
 <!-- optional -->
 <% if (theme.search && theme.search.enable) { %>
-  <%- partial('search') %>
+  <%- partial('../../_plugins/search/script') %>
 <% } %>
 
-
 <% if (theme.plugins.nodewaves.enable) { %>
-  <%- js({src: theme.plugins.nodewaves.js}) %>
-  <script type="text/javascript">
-    $(function () {
-      Waves.attach('.flat-btn', ['waves-button']);
-      Waves.attach('.float-btn', ['waves-button', 'waves-float']);
-      Waves.attach('.float-btn-light', ['waves-button', 'waves-float', 'waves-light']);
-      Waves.attach('.flat-box', ['waves-block']);
-      Waves.attach('.float-box', ['waves-block', 'waves-float']);
-      Waves.attach('.waves-image');
-      Waves.init();
-    });
-  </script>
+  <%- partial('../../_plugins/nodewaves/script') %>
 <% } %>
 
 <% if (theme.plugins.comment_typing.enable) { %>
   <%- js(theme.plugins.comment_typing.js) %>
 <% } %>
 
-<% if (theme.plugins.highlightjs.enable) { %>
-  <% if (theme.plugins.highlightjs.js) { %>
-    <%- js(theme.plugins.highlightjs.js) %>
-    <script>hljs.initHighlightingOnLoad();</script>
-  <% } %>
+<% if (theme.plugins.code_highlight) { %>
+  <%- partial('../../_plugins/highlight/script') %>
 <% } %>
 
 <% if (theme.analytics && theme.analytics.leancloud && theme.analytics.leancloud.app_id) { %>
-  <%- partial('counter') %>
+  <%- partial('../../_plugins/analytics/LCCounter') %>
 <% } %>
 
-<% if (theme.plugins.darkmodejs.enable) { %>
-  <%- partial('darkmode') %>
+<% if (config.google_analytics_key || config.baidu_analytics_key || config.tencent_aegis_id || config.v6_51_la) { %>
+  <%- partial('../../_plugins/analytics/script') %>
 <% } %>
 
-<%- partial('../../_third-party/analytics/script') %>
+<% if (theme.plugins.chat_service) { %>
+  <%- partial('../../_plugins/chat/index') %>
+<% } %>
 
-<%- partial('toc') %>
+<% if (theme.plugins.parallax.enable) { %>
+  <%- partial('../../_plugins/parallax/script') %>
+<% } %>
+
+<% if (theme.plugins.swiper.enable) { %>
+  <%- partial('../../_plugins/swiper/script') %>
+<% } %>
 
-<!-- more -->
-<% if (config.import && config.import.script) { %>
-  <%- partial('import') %>
+<!-- pjax 标签必须存在于所有页面 否则 pjax error -->
+<pjax>
+<% if (page.plugins) { %>
+<%- partial('../../_plugins/_page_plugins/index') %>
 <% } %>
+</pjax>
 
+<%- partial('toc') %>
+
+<%- partial('content-visibility-scroll-fix') %>
+
+<% if (theme.structured_data && theme.structured_data.enable) { %>
+  <%- structured_data() %>
+<% } %>
 

package/layout/_partial/scripts/toc.ejs

@@ -1,80 +1,110 @@
 <script>
-function listennSidebarTOC() {
-  const navItems = document.querySelectorAll(".toc li");
-  if (!navItems.length) return;
-  const sections = [...navItems].map((element) => {
-    const link = element.querySelector(".toc-link");
-    const target = document.getElementById(
-      decodeURI(link.getAttribute("href")).replace("#", "")
-    );
-    link.addEventListener("click", (event) => {
-      event.preventDefault();
-      window.scrollTo({
-		top: target.offsetTop + 100,
-		<% if (theme.custom_css.toc_smooth) { %>
-		behavior: "smooth"
-		<% } %>
-	  });
+  function listennSidebarTOC() {
+    const navItems = document.querySelectorAll(".toc li");
+    if (!navItems.length) return;
+    let targets = []
+    const sections = [...navItems].map((element) => {
+      const link = element.querySelector(".toc-link");
+      const target = document.getElementById(
+        decodeURI(link.getAttribute("href")).replace("#", "")
+      );
+      targets.push(target)
+      // 解除 a 标签 href 的 锚点定位, a 标签 href 的 锚点定位 会随机启用?? 产生错位???
+      link.setAttribute("onclick","return false;")
+      link.setAttribute("toc-action","toc-"+decodeURI(link.getAttribute("href")).replace("#", ""))
+      link.setAttribute("href","/")
+      // 配置 点击 触发新的锚点定位
+      link.addEventListener("click", (event) => {
+        event.preventDefault();
+        // 这里的 addTop 是通过错位使得 toc 自动展开.
+        volantis.scroll.to(target,{addTop: 5, observer:true})
+        // Anchor id
+        history.pushState(null, document.title, "#" + target.id);
+      });
+      return target;
     });
-    return target;
-  });
 
-  function activateNavByIndex(target) {
-    if (target.classList.contains("active-current")) return;
+    function activateNavByIndex(target) {
+      if (target.classList.contains("active-current")) return;
 
-    document.querySelectorAll(".toc .active").forEach((element) => {
-      element.classList.remove("active", "active-current");
-    });
-    target.classList.add("active", "active-current");
-    let parent = target.parentNode;
-    while (!parent.matches(".toc")) {
-      if (parent.matches("li")) parent.classList.add("active");
-      parent = parent.parentNode;
-    }
-  }
-
-  function findIndex(entries) {
-    let index = 0;
-    let entry = entries[index];
-    if (entry.boundingClientRect.top > 0) {
-      index = sections.indexOf(entry.target);
-      return index === 0 ? 0 : index - 1;
-    }
-    for (; index < entries.length; index++) {
-      if (entries[index].boundingClientRect.top <= 0) {
-        entry = entries[index];
-      } else {
-        return sections.indexOf(entry.target);
+      document.querySelectorAll(".toc .active").forEach((element) => {
+        element.classList.remove("active", "active-current");
+      });
+      target.classList.add("active", "active-current");
+      let parent = target.parentNode;
+      while (!parent.matches(".toc")) {
+        if (parent.matches("li")) parent.classList.add("active");
+        parent = parent.parentNode;
       }
     }
-    return sections.indexOf(entry.target);
-  }
 
-  function createIntersectionObserver(marginTop) {
-    marginTop = Math.floor(marginTop + 10000);
-    let intersectionObserver = new IntersectionObserver(
-      (entries, observe) => {
-        let scrollHeight = document.documentElement.scrollHeight + 100;
-        if (scrollHeight > marginTop) {
-          observe.disconnect();
-          createIntersectionObserver(scrollHeight);
-          return;
+    // 方案一：
+    volantis.activateNavIndex=0
+    activateNavByIndex(navItems[volantis.activateNavIndex])
+    volantis.scroll.push(()=>{
+      if (targets[0].getBoundingClientRect().top >= 0) {
+        volantis.activateNavIndex = 0
+      }else if (targets[targets.length-1].getBoundingClientRect().top < 0) {
+        volantis.activateNavIndex = targets.length-1
+      } else {
+        for (let index = 0; index < targets.length; index++) {
+          const target0 = targets[index];
+          const target1 = targets[(index+1)%targets.length];
+          if (target0.getBoundingClientRect().top < 0&&target1.getBoundingClientRect().top >= 0) {
+            volantis.activateNavIndex=index
+            break;
+          }
         }
-        let index = findIndex(entries);
-        activateNavByIndex(navItems[index]);
-      },
-      {
-        rootMargin: marginTop + "px 0px -100% 0px",
-        threshold: 0,
       }
-    );
-    sections.forEach((element) => {
-      element && intersectionObserver.observe(element);
-    });
+      activateNavByIndex(navItems[volantis.activateNavIndex])
+    })
+
+    // 方案二：
+    // IntersectionObserver 不是完美精确到像素级别 也不是低延时性的
+    // function findIndex(entries) {
+    //   let index = 0;
+    //   let entry = entries[index];
+    //   if (entry.boundingClientRect.top > 0) {
+    //     index = sections.indexOf(entry.target);
+    //     return index === 0 ? 0 : index - 1;
+    //   }
+    //   for (; index < entries.length; index++) {
+    //     if (entries[index].boundingClientRect.top <= 0) {
+    //       entry = entries[index];
+    //     } else {
+    //       return sections.indexOf(entry.target);
+    //     }
+    //   }
+    //   return sections.indexOf(entry.target);
+    // }
+    // function createIntersectionObserver(marginTop) {
+    //   marginTop = Math.floor(marginTop + 10000);
+    //   let intersectionObserver = new IntersectionObserver(
+    //     (entries, observe) => {
+    //       let scrollHeight = document.documentElement.scrollHeight;
+    //       if (scrollHeight > marginTop) {
+    //         observe.disconnect();
+    //         createIntersectionObserver(scrollHeight);
+    //         return;
+    //       }
+    //       let index = findIndex(entries);
+    //       activateNavByIndex(navItems[index]);
+    //     }, {
+    //       rootMargin: marginTop + "px 0px -100% 0px",
+    //       threshold: 0,
+    //     }
+    //   );
+    //   sections.forEach((element) => {
+    //     element && intersectionObserver.observe(element);
+    //   });
+    // }
+    // createIntersectionObserver(document.documentElement.scrollHeight);
   }
-  createIntersectionObserver(document.documentElement.scrollHeight);
-}
 
-document.addEventListener("DOMContentLoaded", listennSidebarTOC);
-document.addEventListener("pjax:success", listennSidebarTOC);
+  document.addEventListener("DOMContentLoaded", ()=>{
+    volantis.requestAnimationFrame(listennSidebarTOC)
+  });
+  document.addEventListener("pjax:success", ()=>{
+    volantis.requestAnimationFrame(listennSidebarTOC)
+  });
 </script>

package/layout/_partial/side.ejs

@@ -1,3 +1,6 @@
-<aside class='l_side'>
+<aside id='l_side' itemscope itemtype="http://schema.org/WPSideBar">
   <%- partial('../_widget/load', {widgets: page.sidebar, where: 'sidebar'}) %>
+  <!-- Custom Files side begin -->
+  <%- volantis_inject('side') %>
+  <!-- Custom Files side end -->
 </aside>

package/layout/_plugins/_page_plugins/artitalk/index.ejs

@@ -0,0 +1,15 @@
+<script>
+  volantis.layoutHelper("page-plugins",`<div id="artitalk_main"></div>`,{pjax:false}) // 外层有 pjax 标签
+</script>
+<script>
+  volantis.import.jQuery().then(()=>{
+    volantis.js("<%= theme.plugins.artitalk.js %>").then(()=>{
+      new Artitalk(Object.assign(<%- JSON.stringify(theme.plugins.artitalk) %>, {}))
+    })
+  })
+</script>
+<style>
+  #artitalk_main #lazy {
+    background: transparent !important;
+  }
+</style>

package/layout/_plugins/_page_plugins/bbtalk/index.ejs

@@ -0,0 +1,10 @@
+<script>
+  volantis.layoutHelper("page-plugins",`<div id="bbtalk"></div>`,{pjax:false}) // 外层有 pjax 标签
+</script>
+<script>
+  volantis.import.jQuery().then(()=>{
+    volantis.js("<%= theme.plugins.bbtalk.js %>").then(()=>{
+      bbtalk.init(Object.assign(<%- JSON.stringify(theme.plugins.bbtalk) %>, {}))
+    })
+  })
+</script>

package/layout/_plugins/_page_plugins/fcircle/index.ejs

@@ -0,0 +1,12 @@
+<script>
+  volantis.layoutHelper("page-plugins",`<div class="post-content"><div id="cf-container"><%- theme.plugins.fcircle.message %></div></div>`,{pjax:false}) // 外层有 pjax 标签
+</script>
+<script type="text/javascript">
+    var fdataUser = {
+        apiurl: '<%- theme.plugins.fcircle.api %>'
+    }
+</script>
+<link rel="stylesheet" href="<%- theme.plugins.fcircle.css %>">
+<script type="text/javascript"
+    src="<%- theme.plugins.fcircle.js %>">
+</script>

package/layout/_plugins/_page_plugins/gitter/index.ejs

@@ -0,0 +1,14 @@
+<%- partial( "../../chat/gitter/script") %>
+
+<script>
+  // 这里是 page plugin
+  volantis.removeGitter=()=>{
+    document.querySelectorAll(".gitter-chat-embed").forEach(e=>{
+      e.remove()
+    })
+    document.querySelectorAll(".gitter-open-chat-button").forEach(e=>{
+      e.remove()
+    })
+  }
+  volantis.pjax.send(volantis.removeGitter)
+</script>

package/layout/_plugins/_page_plugins/indent/index.ejs

@@ -0,0 +1,16 @@
+<style>
+  #post-body p {
+    text-indent: 2em;
+  }
+  #post-body .new-meta-box p,
+  #post-body .note p,
+  #post-body .prev-next p,
+  #post-body .tag p,
+  #post-body blockquote p,
+  #post-body details p,
+  #post-body p.p,
+  #post-body .tab-pane .checkbox
+  #post-body section p {
+    text-indent: initial;
+  }
+</style>

package/layout/_plugins/_page_plugins/index.ejs

@@ -0,0 +1,27 @@
+<%_
+(page.plugins||[]).forEach(function(item){
+  try {
+      if (typeof item == "string") { _%>
+        <%- partial( item + "/index") %>
+<%_   }else if(typeof item == "object"){    _%>
+      <%- partial( Object.keys(item)[0] + "/index", { pagePlugin:item }) %>
+<%_   }
+  } catch (error) {
+    // error friendly
+    console.log(`
+===============================================================================
+    没有找到页面插件：${item}
+    请检查是否存在该插件，或者检查插件名称是否正确：${item}
+    出问题的页面：${page.path}
+    see: https://volantis.js.org/v5/page-settings/#页面插件-page-plugins
+================================================================================
+    There is no page plugin: ${item}
+    Please check if the plugin exists, or check the plugin name is correct: ${item}
+    The page that has problem: ${page.path}
+    see: https://volantis.js.org/v5/page-settings/#页面插件-page-plugins
+=================================================================================`);
+  }
+
+})
+
+_%>

package/layout/_plugins/_page_plugins/katex/index.ejs

@@ -0,0 +1,13 @@
+<script>
+  // https://www.micdz.cn/article/katex-on-volantis/
+  if (typeof renderMathInElement == "undefined") {
+    volantis.css("<%= theme.plugins.katex.css %>")
+    function pjax_katex() {
+      volantis.js("<%= theme.plugins.katex.render %>").then(()=>{
+        renderMathInElement(document.body);
+      })
+    }
+    volantis.js("<%= theme.plugins.katex.js %>").then(pjax_katex)
+    volantis.pjax.push(pjax_katex)
+  }
+</script>

package/layout/{_third-party/math/mathjax/script.ejs → _plugins/_page_plugins/mathjax/index.ejs}

@@ -38,7 +38,7 @@
     };
     (function () {
       var script = document.createElement('script');
-      script.src = 'https://cdn.jsdelivr.net/npm/mathjax@3.0/es5/tex-mml-chtml.js';
+      script.src = "<%= theme.plugins.mathjax %>";
       script.defer = true;
       document.head.appendChild(script);
     })();
@@ -46,6 +46,6 @@
     // 文章章节标题不能为 “MathJax” ，否则会报错。
     MathJax.startup.document.state(0);
     MathJax.texReset();
-    MathJax.typeset();
+    MathJax.typesetPromise();
   }
 </script>

package/layout/_plugins/_page_plugins/snackbar/index.ejs

@@ -0,0 +1,55 @@
+<% if (site.data.notification && (pagePlugin.snackbar in site.data.notification)) { %>
+<% let snackbar = site.data.notification[pagePlugin.snackbar] %>
+<% if (snackbar.position == 'bottom') { %>
+  <div id="snackbar"></div>
+  <script>
+    function Snackbar(){
+      document.getElementById("snackbar").innerHTML=`<div class='snackbar-wrap' theme='<%- snackbar.theme %>'>
+      <div class="snackbar-content">
+        <div class='title'><%- markdown(snackbar.title) %></div>
+        <div class='message'><%- markdown(snackbar.message) %></div>
+        <% if (snackbar.buttons && snackbar.buttons.length > 0) { %>
+          <div class="action">
+          <% snackbar.buttons.forEach((ac, i) => { %>
+            <% if (ac.dismiss) { %>
+              <a onclick="document.getElementsByClassName('snackbar-wrap')[0].style.display = 'none'">
+                <%- ac.title %>
+              </a>
+            <% } else { %>
+              <a href='<%- ac.url %>'>
+                <%- ac.title %>
+              </a>
+            <% } %>
+          <% }) %>
+          </div>
+        <% } %>
+      </div>
+    </div>`
+    }
+  </script>
+<% } else if (snackbar.position == 'right') { %>
+  <% if (snackbar.buttons && snackbar.buttons.length > 0) { %>
+      <script>
+        function Snackbar(){
+          <% snackbar.buttons.forEach((ac, i) => { %>
+            VolantisApp.message(
+              '<%- snackbar.title %>',
+              '<%- snackbar.message %><br>' + "<a href='<%- ac.url %>'><%- ac.title %></a>"
+            );
+          <% }) %>
+        }
+      </script>
+  <% } %>
+<% } %>
+
+<script>
+<% if (snackbar.cache) { %>
+  if (!localStorage.getItem('Snackbar')) {
+    localStorage.setItem('Snackbar', '1');
+    Snackbar();
+  }
+<% } else { %>
+  Snackbar()
+<% }%>
+</script>
+<% } %>