hexo-theme-volantis 5.5.0 → 5.6.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [5.6.0](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.5.0...v5.6.0) (2022-06-30)
+
+
+### ⚠ BREAKING CHANGES
+
+* **artalk:** imgUploader -> imageUploader
+
+### Bug Fixes
+
+* **comment:** disqus ([6656237](https://github.com/volantis-x/hexo-theme-volantis/commit/665623793b7610f2d9be8c1338c23e82f1b98159))
+* **highlightjs:** cdn npm ([2caa1fb](https://github.com/volantis-x/hexo-theme-volantis/commit/2caa1fb1e630381ed9ea019038a4d8580d17703c))
+* **meta:** counter ([7470b7a](https://github.com/volantis-x/hexo-theme-volantis/commit/7470b7abcfbc545e5552363c85b9562e42e75541))
+* **rightmenu:** [#779](https://github.com/volantis-x/hexo-theme-volantis/issues/779) ([9023ce5](https://github.com/volantis-x/hexo-theme-volantis/commit/9023ce573d8ad0595990dafb13553817d749fee8))
+
+
+### Code Refactoring
+
+* **artalk:** imgUploader -> imageUploader ([8cde195](https://github.com/volantis-x/hexo-theme-volantis/commit/8cde195b30c2111338ac2bcec45bcaf145867ccf))
+
+
+### Miscellaneous Chores
+
+* release 5.6.0 ([cd60196](https://github.com/volantis-x/hexo-theme-volantis/commit/cd60196d4dc730d9d8d238ad1958f868b103ebfb))
+
 ## [5.5.0](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.4.0...v5.5.0) (2022-06-18)
 
 

package/_config.yml

@@ -205,13 +205,13 @@ article:
       # ----------------
       # 版权声明组件 (for layout: post)
       copyright:
-        enable: true
+        enable: false
         permalink: '本文永久链接是：'
         content:
           - '博客内容遵循 署名-非商业性使用-相同方式共享 4.0 国际 (CC BY-NC-SA 4.0) 协议'
           - permalink
          # 自定义版权组件：精细到文章的版权声明
-        custom: true # 开启后替代上方内容的版权显示
+        custom: false # 开启后替代上方内容的版权显示
         customData:
           default: type1  # 默认授权声明
           #############################
@@ -324,7 +324,7 @@ comments:
     placeholder: # 评论占位
     # artalk 有三类图片：1.上传至服务端 2.上传至服务端后利用upgit上传至图床 3.前端上传至图床（本配置为此类）
     # 配置此项时将覆盖服务端上传能力
-    imgUploader:
+    imageUploader:
       # 以兰空图床为例，下列填写内容为：
       # url: 'https://xxxxxx/api/v1/upload'
       # token: 'Bearer xxxxxxxxxxxxxx'
@@ -575,21 +575,21 @@ sidebar:
           text: '文章数目：'
           unit: '篇'
         runtime:
-          enable: true
+          enable: false
           data: '2020/01/01'    # 填写建站日期
           text: '已运行时间：'
           unit: '天'
         wordcount:
-          enable: true
+          enable: false
           text: '本站总字数：'   # 需要启用 wordcount
           unit: '字'
         visitcounter:
           siteuv:
-            enable: true
+            enable: false
             text: '本站访客数：'
             unit: '人'
           sitepv:
-            enable: true
+            enable: false
             text: '本站总访问量：'
             unit: '次'
         lastupd:
@@ -713,9 +713,9 @@ plugins:
     copy_code: true
     # 如果开启以下配置, hexo.config.highlight.enable 需要设置为 false ; hexo.config.highlight.enable 设置为 true, 则以下配置无效
     # # 不再支持 v11.1.0 以下版本
-    # js: https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.2.0/build/highlight.min.js # Please set hexo.config.highlight.enable = false !!!
-    # css: https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.2.0/build/styles/default.min.css
-    # # # more: https://www.jsdelivr.com/package/npm/highlight.js?path=styles
+    # js: https://unpkg.com/@highlightjs/cdn-assets@11.5.1/highlight.min.js # Please set hexo.config.highlight.enable = false !!!
+    # css: https://unpkg.com/@highlightjs/cdn-assets@11.5.1/styles/default.min.css
+    # # # more: https://www.jsdelivr.com/package/npm/@highlightjs/cdn-assets?path=styles
 
   # prismjs
   # https://prismjs.com/
@@ -950,7 +950,7 @@ plugins:
 
 ### 自定义右键 新
 rightmenus:
-  enable: true
+  enable: false
   # 右键菜单项及加载顺序
   # 内容示例：plugins.[组名], menus.[组名], hr(分割线，推荐去线留白), music(音乐控制器)
   order:
@@ -986,9 +986,9 @@ rightmenus:
     # 图标前缀 fa-solid, fa-regular, fa-light, fa-thin, fa-duotone, fa-brands
     iconPrefix: fa-solid
     # 例外，在 articlePage 组显示时（文章页）时依旧显示含 link 属性的菜单项
-    articleShowLink: false
+    articleShowLink: true
     # 当设定全局音乐播放器时，是否一直显示音乐控制菜单。false：仅当音乐播放时启用
-    musicAlwaysShow: false
+    musicAlwaysShow: true
   # 右键内置组，预置实现
   plugins:
     # 导航组件

package/layout/_meta/counter.ejs

@@ -12,9 +12,19 @@
 
   if(commentPath) path = commentPath;
   path = path.replaceAll('/index.html', '/').replaceAll('.html', '')
+
+  let checkComment = false;
+  if (theme.analytics && theme.analytics.leancloud && theme.analytics.leancloud.app_id
+    || theme.analytics.busuanzi
+    || theme.comments.service=='waline' && theme.comments.waline.pageview
+    || theme.comments.service=='twikoo'
+    || theme.comments.service=='discuss'
+    || theme.comments.service=='artalk') {
+    checkComment = !checkComment;
+  } 
 %>
 
-<% if (!!page.comments) { %>
+<% if (!!page.comments && checkComment) { %>
 <div class="new-meta-item browse">
   <a class='notlink'>
     <p>

package/layout/_plugins/comments/artalk/script.ejs

@@ -27,7 +27,7 @@
       darkMode: volantis.dark.mode === "dark",
       pvEl: '#artalk_visitors',
 
-      <% if(!!theme.comments.artalk.imgUploader?.api){ %>
+      <% if(!!theme.comments.artalk.imageUploader?.api){ %>
       imgUploader: function(file) {
         let headers = new Headers();
         headers.set('Accept', 'application/json');
@@ -46,7 +46,7 @@
       <% } %>
     }));
 
-    Artalk.Use(ctx => {
+    Artalk.use(ctx => {
       ctx.on('list-loaded', () => {
         if (typeof VolantisFancyBox === "undefined"){
           const checkFancyBox = setInterval(() => {

package/layout/_plugins/comments/disqus/script.ejs

@@ -71,6 +71,7 @@
 
   // 点击了加载
   function needLoadDisqus() {
+    if(!document.querySelectorAll("#layoutHelper-comments")[0])return;
     checkDisqus();
     volantis.dom.$(document.getElementById("load-btns")).hide();
     volantis.dom.$(document.getElementById("loading-comments")).show();

package/layout/_plugins/rightmenus/layout.ejs

@@ -82,7 +82,7 @@
 <% rightMenu.rederFunction = item => { %>
 <%   if (!!item && !!item['event'] && item['group'] !== 'navigation') { %>
 <%     if (rightMenu.defaultEvent.some(value => { return value === item['event'] })) { %>
-  <!-- RightMenusFunction['<%- item.id %>'] = (fun) => {fun()} -->
+  //RightMenusFunction['<%- item.id %>'] = (fun) => {fun()}
 <%     } else if (item['group'] === 'seletctText') { %>
   RightMenusFunction['<%- item.id %>'] = (__text__) => {<%- item.event %>}
 <%     } else if (item['group'] === 'elementCheck' || item['group'] === 'elementImage') { %>

package/layout/_widget/webinfo.ejs

@@ -25,10 +25,10 @@
         </div>
       <% } %>
 
-      <% if (item.type.visitcounter.siteuv.enable && (!!theme.analytics.busuanz || !!theme.analytics.leancloud.app_id)) { %>
+      <% if (item.type.visitcounter.siteuv.enable && (!!theme.analytics.busuanzi || !!theme.analytics.leancloud.app_id)) { %>
         <div class="webinfo-item">
           <div><%= item.type.visitcounter.siteuv.text %></div>
-          <% if (!!theme.analytics.busuanz) {%>
+          <% if (!!theme.analytics.busuanzi) {%>
           <div><span id="busuanzi_value_site_uv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.siteuv.unit %></div>
           <% } else { %>
           <div><span id="lc-uv"><span id='number'><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.siteuv.unit %></div>
@@ -36,10 +36,10 @@
         </div>
       <% } %>
 
-      <% if (item.type.visitcounter.sitepv.enable && (!!theme.analytics.busuanz || !!theme.analytics.leancloud.app_id)) { %>
+      <% if (item.type.visitcounter.sitepv.enable && (!!theme.analytics.busuanzi || !!theme.analytics.leancloud.app_id)) { %>
         <div class="webinfo-item">
           <div><%= item.type.visitcounter.sitepv.text %></div>
-          <% if (!!theme.analytics.busuanz) {%>
+          <% if (!!theme.analytics.busuanzi) {%>
           <div><span id="busuanzi_value_site_pv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.sitepv.unit %></div>
           <% } else { %>
           <div><span id="lc-sv"><span id='number'><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.sitepv.unit %></div>

package/package.json

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

package/source/js/plugins/rightMenus.js

@@ -563,21 +563,20 @@ RightMenus.fun = (() => {
 
   fn.readMode = () => {
     if (typeof ScrollReveal === 'function') ScrollReveal().clean('#comments');
-    DOMController.removeList([ 
-      '.cus-article-bkg', '.iziToast-overlay', '.iziToast-wrapper', '.prev-next', 
-      'footer', '#l_header', '#l_cover', '#l_side', '#comments', '#s-top', '#BKG', 
-      '#rightmenu-wrapper', '.nav-tabs', '.parallax-mirror', '.new-meta-item.share',  
-      '.new-meta-box', 'button.btn-copy', 'iframe' 
-    ]); 
-    DOMController.setStyleList([ 
-      ['body', 'backgroundColor', 'unset'], ['#l_main, .copyright.license', 'width', '100%'],  
-      ['#post', 'boxShadow', 'none'], ['#post', 'background', 'none'], ['#post', 'padding', '0'],  
-      ['h1', 'textAlign', 'center'], ['h1', 'fontWeight', '600'], ['h1', 'fontSize', '2rem'], ['h1', 'marginBottom', '20px'], 
-      ['.tab-pane', 'display', 'block'], ['.tab-content', 'borderTop', 'none'], ['.highlight>table pre', 'whiteSpace', 'pre-wrap'], 
-      ['.highlight>table pre', 'wordBreak', 'break-all'], ['.fancybox img', 'height', 'auto'], ['.fancybox img', 'weight', 'auto'], 
-      ['.copyright.license', 'margin', '0'], ['.copyright.license', 'padding', '1.25em 20px'],  
-      ['figure.highlight, .copyright.license', 'display', 'inline-block'], 
-    ]); 
+    DOMController.fadeToggleList([  
+      document.querySelector('#l_header'), document.querySelector('footer'),  
+      document.querySelector('#s-top'), document.querySelector('.article-meta#bottom'),  
+      document.querySelector('.prev-next'), document.querySelector('#l_side'),  
+      document.querySelector('#comments')  
+    ]);  
+    DOMController.toggleClassList([  
+      [document.querySelector('#l_main'), 'common_read'], [document.querySelector('#l_main'), 'common_read_main'],  
+      [document.querySelector('#l_body'), 'common_read'], [document.querySelector('#safearea'), 'common_read'],  
+      [document.querySelector('#pjax-container'), 'common_read'], [document.querySelector('#read_bkg'), 'common_read_hide'],  
+      [document.querySelector('h1'), 'common_read_h1'], [document.querySelector('#post'), 'post_read'],  
+      [document.querySelector('#l_cover'), 'read_cover'], [document.querySelector('.widget.toc-wrapper'), 'post_read']  
+    ]);
+    DOMController.setStyle('.copyright.license', 'margin', '15px 0'); 
     volantis.isReadModel = volantis.isReadModel === undefined ? true : !volantis.isReadModel;
     if (volantis.isReadModel) {
       if (RightMenus.messageRightMenu) VolantisApp.message('系统提示', '阅读模式已开启，您可以点击屏幕空白处退出。', {
@@ -595,7 +594,8 @@ RightMenus.fun = (() => {
     } else {
       document.querySelector('#l_body').removeEventListener('click', fn.readMode);
       document.querySelector('#post').removeEventListener('click', fn.readMode);
-      document.querySelector('.prev-next').style.display = 'flex'; // 单独修改
+      DOMController.setStyle('.prev-next', 'display', 'flex'); 
+      DOMController.setStyle('.copyright.license', 'margin', '15px -40px'); 
     }
   }