hexo-theme-volantis 5.7.3 → 5.7.6

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [5.7.6](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.7.5...v5.7.6) (2022-09-05)
+
+
+### Performance Improvements
+
+* **debug:** env pjax rightMenus ([7b569cc](https://github.com/volantis-x/hexo-theme-volantis/commit/7b569cce425c0b630f00e378449c4d8809e471fe))
+* **side:** 如果 sidebar 为空，隐藏 sidebar ([a264a8c](https://github.com/volantis-x/hexo-theme-volantis/commit/a264a8c6f7cb8fd2537af227bd0297fcb17d720c))
+
+## [5.7.5](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.7.4...v5.7.5) (2022-08-25)
+
+
+### Bug Fixes
+
+* **pandown:** Uncaught TypeError: pandown is not a function ([371b1ec](https://github.com/volantis-x/hexo-theme-volantis/commit/371b1ece729a719f102854d3175ce440f90b4a14))
+* search ([7f11915](https://github.com/volantis-x/hexo-theme-volantis/commit/7f11915c4c672f427a6044e2614ed85e7e052587))
+
+## [5.7.4](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.7.3...v5.7.4) (2022-08-15)
+
+
+### Bug Fixes
+
+* **#793:** 修复空值 ([302c98f](https://github.com/volantis-x/hexo-theme-volantis/commit/302c98fc5b0c725fb77c6bb33d7537f8f1f2062f))
+
 ## [5.7.3](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.7.2...v5.7.3) (2022-08-15)
 
 

package/_config.yml

@@ -4,7 +4,7 @@ info:
   theme_docs: https://volantis.js.org/ # This is theme's URL.
   theme_repo: https://github.com/volantis-x/hexo-theme-volantis
 # Debug 调试模式
-debug: false
+debug: env # false: 关闭调试模式， env：环境配置检查， pjax：调试pjax，rightMenus: 调试右键
 ############################### 默认占位图 ###############################
 default:
   avatar: volantis-static/media/placeholder/avatar/round/3442075.svg # https://cdn.jsdelivr.net/gh/cdn-x/placeholder@1.0.1/avatar/round/3442075.svg

package/layout/_partial/scripts/_ctrl/cdnCtrl.ejs

@@ -65,7 +65,7 @@
       const element = n[key];
       if(element && typeof element !="string"){
         dfs(element,path.concat(key))
-      }else{
+      }else if(element){
         let op=path.concat(key)
         let source=""
         for (let index = 1; index < op.length; index++) {
@@ -122,5 +122,6 @@
   //  ?time=' + Date.now() 替换为 theme.getStartTime 保证相同资源 hash 不变
   //  更新：
   //  本地文件使用文件内容的hash值作为版本号 app.8c1e7c88.js see: /scripts/helpers/revisioned.js
+  
   dfs(theme.cdn.set,[])
 _%>

package/layout/_partial/scripts/global.ejs

@@ -1,7 +1,7 @@
 <script>
   /************这个文件存放不需要重载的全局变量和全局函数*********/
   window.volantis = {}; // volantis 全局变量
-  volantis.debug = <%- theme.debug %>; // 开启调试模式
+  volantis.debug = "<%- theme.debug %>"; // 调试模式
   volantis.dom = {}; // 页面Dom see: /source/js/app.js etc.
 
   volantis.GLOBAL_CONFIG ={

package/layout/_plugins/pjax/index.ejs

@@ -31,7 +31,7 @@
         ],
         cacheBust: <%= theme.plugins.pjax.cacheBust %>,   // url 地址追加时间戳，用以避免浏览器缓存
         timeout: <%= theme.plugins.pjax.timeout %>,
-        <% if (theme.debug){ %> debug: true,<% } %>
+        <% if (theme.debug === "pjax"){ %> debug: true,<% } %>
       });
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-volantis",
-  "version": "5.7.3",
+  "version": "5.7.6",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/events/index.js

@@ -7,7 +7,9 @@ hexo.on('generateBefore', () => {
   require('./lib/config')(hexo);
   require('./lib/stellar-tag-utils')(hexo);
   require('./lib/render-stylus')(hexo);
-  require('./lib/check-environment')(hexo);
+  if (hexo.theme.config.debug === "env") {
+    require('./lib/check-environment')(hexo);
+  }
 });
 
 hexo.on('ready', () => {

package/scripts/events/lib/check-environment.js

@@ -57,6 +57,10 @@ Hexo: 5.4 ~ 6.x
 hexo-cli: 4.3 ~ latest
 node.js: 16.x LTS ~ latest LTS
 npm: 8.x ~ latest LTS
+============================================================
+# 当前 Debug 调试模式
+debug: env
+关闭调试模式主题配置文件设置 debug: false
 ============================================================`);
   throw new Error('环境配置检查失败！| Environment configuration check failed!');
 }
@@ -67,6 +71,10 @@ function CheckConfError(hexo,msg) {
 配置文件检查失败！| Configuration check failed!
 ============================================================
 ${msg}
+============================================================
+# 当前 Debug 调试模式
+debug: env
+关闭调试模式主题配置文件设置 debug: false
 ============================================================`);
   throw new Error('配置文件检查失败！| Configuration check failed!');
 }

package/scripts/helpers/revisioned.js

@@ -160,7 +160,7 @@ const replaceRevisionPlaceholder = async () => {
       })
     );
   } catch (error) {
-    
+    hexo.log.error("cdn_version ERROR: " + error);
   }
 };
 

package/scripts/tags/pandown.js

@@ -24,10 +24,10 @@ hexo.extend.tag.register('pandown', function(args) {
     }
     let result = '';
     // js
-    result += '<div class="tag pandown-tags"><script type="text/javascript" src="https://unpkg.com/pandown"></script>';
+    result += '<div class="tag pandown-tags">';
     //pandown
     result += '<pandown type="'+type+'" url="'+url+'" pwd="'+pwd+'" fname="'+fname+'"></pandown>'
     //调用
-    result += '<script>pandown()</script></div>'
+    result += '<script>volantis.js("https://unpkg.com/pandown").then(pandown)</script></div>'
     return result;
 });

package/source/js/app.js

@@ -29,10 +29,10 @@ const locationHash = () => {
     if (target) {
       setTimeout(() => {
         if (window.location.hash.startsWith('#fn')) { // hexo-reference https://github.com/volantis-x/hexo-theme-volantis/issues/647
-          volantis.scroll.to(target, { addTop: - volantis.dom.header.offsetHeight - 5, behavior: 'instant', observer:true })
+          volantis.scroll.to(target, { addTop: - volantis.dom.header.offsetHeight - 5, behavior: 'instant', observer: true })
         } else {
           // 锚点中上半部有大片空白 高度大概是 volantis.dom.header.offsetHeight
-          volantis.scroll.to(target, { addTop: 5, behavior: 'instant', observer:true })
+          volantis.scroll.to(target, { addTop: 5, behavior: 'instant', observer: true })
         }
       }, 1000)
     }
@@ -71,6 +71,15 @@ const VolantisApp = (() => {
       fn.scrolltoElement(volantis.dom.bodyAnchor);
     });
 
+    // 如果 sidebar 为空，隐藏 sidebar。
+    const sidebar = document.querySelector("#l_side")
+    if (sidebar) {
+      const sectionList = sidebar.querySelectorAll("section")
+      if (!sectionList.length) {
+        document.querySelector("#l_main").classList.add("no_sidebar")
+      }
+    }
+
     // 站点信息 最后活动日期
     if (volantis.GLOBAL_CONFIG.sidebar.for_page.includes('webinfo') || volantis.GLOBAL_CONFIG.sidebar.for_post.includes('webinfo')) {
       const lastupd = volantis.GLOBAL_CONFIG.sidebar.webinfo.lastupd;

package/source/js/plugins/rightMenus.js

@@ -381,7 +381,7 @@ RightMenus.fun = (() => {
             fn[eventName]()
           }
         } catch (error) {
-          if (volantis.GLOBAL_CONFIG.debug) {
+          if (volantis.GLOBAL_CONFIG.debug === "rightMenus") {
             console.error({
               id: id,
               error: error,

package/source/js/search/hexo.js

@@ -1,5 +1,5 @@
 let SearchService = (() => {
-  fn = {};
+  const fn = {};
   fn.queryText = null;
   fn.data = null;
   fn.template = `<div id="u-search">
@@ -58,8 +58,8 @@ let SearchService = (() => {
       fn.data = await fn.fetchData();
     }
     let results = "";
-    results += fn.buildResultList(data.pages);
-    results += fn.buildResultList(data.posts);
+    results += fn.buildResultList(fn.data.pages);
+    results += fn.buildResultList(fn.data.posts);
     document.querySelector("#u-search .modal-results").innerHTML = results;
     window.pjax && pjax.refresh(document.querySelector("#u-search"));
     document.addEventListener("keydown", function f(event) {
@@ -76,7 +76,7 @@ let SearchService = (() => {
     return fetch(SearchServiceDataPath)
       .then((response) => response.text())
       .then((res) => {
-        data = JSON.parse(res);
+        const data = JSON.parse(res);
         // console.log(data);
         return data;
       });
@@ -87,8 +87,8 @@ let SearchService = (() => {
       if (post.text) {
         post.text = post.text.replace(/12345\d*/g, "") // 简易移除代码行号
       }
-      if (!post.title&&post.text) {
-        post.title = post.text.trim().slice(0,15)
+      if (!post.title && post.text) {
+        post.title = post.text.trim().slice(0, 15)
       }
       if (fn.contentSearch(post)) {
         html += fn.buildResult(post.permalink, post.title, post.digest);