hexo-theme-volantis 5.0.0-rc.5 → 5.0.0-rc.6

package/_config.yml

@@ -18,7 +18,7 @@ default:
 ############################### Volantis ###############################
 info:
   theme_name: Volantis # This is theme's name.
-  theme_version: '5.0.0-rc.5' # This is theme's version.
+  theme_version: '5.0.0-rc.6' # This is theme's version.
   theme_docs: https://volantis.js.org/ # This is theme's URL.
   theme_repo: https://github.com/volantis-x/hexo-theme-volantis
 # Debug 调试模式
@@ -59,7 +59,7 @@ cdn:
   # CDN 前缀，为空使用默认值，链接最后不加 "/",
   # 例如： https://cdn.jsdelivr.net/gh/volantis-x/volantis-x.github.io@gh-page 填写最后编译生成的源码CDN地址前缀，此路径下应该含有/js与/css目录,
   # 该配置默认值是："https://cdn.jsdelivr.net/npm/hexo-theme-volantis@"+ theme.info.theme_version +"/source"
-  prefix: https://npm.elemecdn.com/hexo-theme-volantis@5.0.0-rc.5/source
+  prefix: https://npm.elemecdn.com/hexo-theme-volantis@5.0.0-rc.6/source
   # 以下配置可以覆盖 cdn.prefix,配置项的值可以为空，但是要使用CDN必须依据路径填写配置项的键
   set:
     js:

package/layout/_meta/counter.ejs

@@ -26,6 +26,23 @@
       </p>
     </a>
   </div>
+  -<% } else if (theme.comments.service=='waline' && theme.comments.waline.visitor) { %>
+  <div class="new-meta-item browse">
+    <a class='notlink'>
+      <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
+      <%
+        var path = post.path || page.path;
+        if (path.length > 9 && (path.substring(path.length - 10) == 'index.html')) {
+          path = path.substring(0, path.length - 10);
+        }
+      %>
+      <span id="<%- url_for(path) %>" class="leancloud_visitors" data-flag-title="<%- post.title || page.title %>">
+      <p>
+        <span class="leancloud-visitors-count"></span>
+      </p>
+      </span>
+    </a>
+  </div>
 <% } else if (theme.comments.service=='twikoo' && !!page.comments) { %>
   <div class="new-meta-item browse">
     <a class='notlink'>

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

@@ -89,7 +89,6 @@
   theme.cdn.addJS("rightMenu", "plugins/rightMenu")
   theme.cdn.addJS("contributors","plugins/contributors")
   theme.cdn.addJS("message", "thirdparty/message")
-  theme.cdn.addJS("valine","thirdparty/valine",theme.comments.valine.js)
   theme.cdn.addJS("search","search/"+theme.search.service,theme.search.js)
 
   // 以下用于配置项 cdn.set 覆盖配置,下面是覆盖配置的方法

package/layout/_plugins/rightmenu/layout.ejs

@@ -93,9 +93,9 @@
               <p class='nav music-title fix-cursor-default'></p>
             </li>
             <li class='music ctrl'>
-              <a class='nav icon-only backward fix-cursor-default' onclick='RightMenuAplayer.aplayerBackward()'><i class='<%= faIcon %> fa-step-backward fa-fw '></i></a>
-              <a class='nav icon-only toggle fix-cursor-default' onclick='RightMenuAplayer.aplayerToggle()'><i class='<%= faIcon %> fa-play fa-fw '></i></a>
-              <a class='nav icon-only forward fix-cursor-default' onclick='RightMenuAplayer.aplayerForward()'><i class='<%= faIcon %> fa-step-forward fa-fw '></i></a>
+              <a class='nav icon-only backward fix-cursor-default' href="/" onclick="return false;" title="backward"><i class='<%= faIcon %> fa-step-backward fa-fw'></i></a>
+              <a class='nav icon-only toggle fix-cursor-default' href="/" onclick="return false;" title="toggle"><i class='<%= faIcon %> fa-play fa-fw'></i></a>
+              <a class='nav icon-only forward fix-cursor-default' href="/" onclick="return false;" title="forward"><i class='<%= faIcon %> fa-step-forward fa-fw'></i></a>
             </li>
             <li class='music volume'>
               <div class='nav volume'>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-volantis",
-  "version": "5.0.0-rc.5",
+  "version": "5.0.0-rc.6",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {
@@ -22,8 +22,9 @@
   },
   "homepage": "https://volantis.js.org",
   "devDependencies": {
-    "hexo": "^6.0.0",
+    "hexo": "^6.1.0",
     "hexo-renderer-stylus": "^2.0.1",
-    "hexo-renderer-ejs": "^2.0.0"
+    "hexo-renderer-ejs": "^2.0.0",
+    "hexo-generator-json-content": "^4.2.3"
   }
 }

package/scripts/filters/CSP.js

@@ -13,6 +13,9 @@ let unsafe_script_list = [
   "errorImgCover(this)",
   "return false;",
   "return!1",
+  "history.back()",
+  "history.forward()",
+  "window.location.reload()",
 ]
 // script hash White list
 let unsafe_script_hash = ["'sha256-MXV1jvkHrZruEyFEOrQRjKs9WlPZC1V/3RLoKrkoDFQ='"]
@@ -68,4 +71,4 @@ hexo.extend.filter.register('after_render:html', function(data) {
     data = data.replace(/script-src 'self' https: 'unsafe-inline'/g, `script-src 'self' https: 'nonce-${nonce}' 'unsafe-hashes' ` + unsafe_script_hash.join(" "));
     return data;
   }
-},99999999999999999);
+},99999999999999999);

package/source/css/_style/_layout/article.styl

@@ -139,7 +139,7 @@
       background: transparent
       color: alpha($color-text, 90%)
   code
-    font-family: $fontfamily
+    font-family: $fontfamily-code
     &:not([class])
       word-break: break-all
       color: var(--color-inlinecode)

package/source/css/_style/_plugins/cursor.styl

@@ -45,12 +45,10 @@ button[disabled],html input[disabled],
 ul.list-v.rightmenu a,
 span.btn a:not([href]),
 div.tabs ul.nav-tabs li.tab.active a,
-article#comments #valine_container .vcards .vhead span.vnick,
 kbd,
 .a > p,
 .not-select,
 .not-select p,
-.MiniValine *,
 .aplayer .aplayer-info .aplayer-music,
 .gt-container a.is--active,
 .iziToast,
@@ -104,14 +102,6 @@ div.tabs ul.nav-tabs li.tab a,
 .aplayer .aplayer-list ol li .aplayer-list-index,
 .waves-button, .waves-button-input, .waves-button:hover, .waves-button:visited,
 .fancybox-button,
-.MiniValine .vbtn,
-.MiniValine .vcancel-comment-reply,
-.MiniValine .vcancel-comment-reply svg,
-.MiniValine .vlist .vcard .vcomment-body .vat,
-.MiniValine .vlist .vcard .vcomment-body .vhead .vname,
-.MiniValine .vinputs-area .btn-wrap .vfunction-btn svg,
-.MiniValine .vinputs-area .vextra-area .vsmile-icons img,
-.MiniValine .vlist .vcard .vcomment-body .text-wrapper .vcomment a,
 .gt-container .gt-btn,
 .gt-container .gt-user-inner,
 .gt-container .gt-avatar-github,

package/source/css/_style/_plugins/index.styl

@@ -10,8 +10,6 @@ if hexo-config('plugins.aplayer.enable')
   @import 'aplayer'
 if hexo-config('plugins.pjax.enable') and hexo-config('plugins.pjax.animation')
   @import 'pjaxanimate'
-if hexo-config('comments.service')=='valine'
-  @import 'valine'
 if hexo-config('comments.service')=='gitalk'
   @import 'gitalk'
 if hexo-config('custom_css.cursor.enable')

package/source/js/app.js

@@ -88,15 +88,9 @@ const VolantisApp = (() => {
     }
 
     // 消息提示 复制时弹出
-    if (volantis.GLOBAL_CONFIG.plugins.message.enable
-      && volantis.GLOBAL_CONFIG.plugins.message.copyright.enable) {
-      document.body.oncopy = function () {
-        VolantisApp.message(volantis.GLOBAL_CONFIG.plugins.message.copyright.title,
-          volantis.GLOBAL_CONFIG.plugins.message.copyright.message, {
-          icon: volantis.GLOBAL_CONFIG.plugins.message.copyright.icon
-        });
-      };
-    }
+    document.body.oncopy = function () {
+      fn.messageCopyright()
+    };
   }
 
   fn.restData = () => {
@@ -638,13 +632,19 @@ const VolantisApp = (() => {
   }
 
   // 消息提示：复制
+  let messageCopyrightShow = 0;
   fn.messageCopyright = () => {
     // 消息提示 复制时弹出
     if (volantis.GLOBAL_CONFIG.plugins.message.enable
-      && volantis.GLOBAL_CONFIG.plugins.message.copyright.enable) {
+      && volantis.GLOBAL_CONFIG.plugins.message.copyright.enable
+      && messageCopyrightShow < 3) {
+      messageCopyrightShow++;
       VolantisApp.message(volantis.GLOBAL_CONFIG.plugins.message.copyright.title,
         volantis.GLOBAL_CONFIG.plugins.message.copyright.message, {
-        icon: volantis.GLOBAL_CONFIG.plugins.message.copyright.icon
+        icon: volantis.GLOBAL_CONFIG.plugins.message.copyright.icon,
+        transitionIn: 'flipInX',
+        transitionOut: 'flipOutX',
+        displayMode: 1
       });
     }
   }
@@ -678,7 +678,8 @@ const VolantisApp = (() => {
       document.querySelector("#l_header .nav-main").querySelectorAll('.list-v:not(.menu-phone)').forEach(function (e) {
         e.removeAttribute("style")
       })
-      document.querySelector("#l_header .menu-phone.list-v").removeAttribute("style")
+      document.querySelector("#l_header .menu-phone.list-v").removeAttribute("style");
+      messageCopyrightShow = 0;
     },
     utilCopyCode: fn.utilCopyCode,
     utilWriteClipText: fn.utilWriteClipText,

package/source/js/plugins/aplayer.js

@@ -120,7 +120,6 @@ const RightMenuAplayer = (() => {
 
   // 播放/暂停
   fn.aplayerToggle = () => {
-    event.stopPropagation();
     fn.checkAPlayer();
     try {
       APlayer.player.toggle();
@@ -131,7 +130,6 @@ const RightMenuAplayer = (() => {
 
   // 上一曲
   fn.aplayerBackward = () => {
-    event.stopPropagation();
     fn.checkAPlayer();
     try {
       APlayer.player.skipBack();
@@ -143,7 +141,6 @@ const RightMenuAplayer = (() => {
 
   // 下一曲
   fn.aplayerForward = () => {
-    event.stopPropagation();
     fn.checkAPlayer();
     try {
       APlayer.player.skipForward();

package/source/js/plugins/rightMenu.js

@@ -7,7 +7,6 @@ const RightMenu = (() => {
     fn = {},
     _rightMenuWrapper = document.getElementById('rightmenu-wrapper'),
     _rightMenuContent = document.getElementById('rightmenu-content'),
-    _menuDarkBtn = document.getElementById('menuDarkBtn'),
     _printHtml = document.getElementById('printHtml'),
     _menuMusic = document.getElementById('menuMusic'),
     _readingModel = document.getElementById('readingModel'),
@@ -24,7 +23,10 @@ const RightMenu = (() => {
     _copyHref = document.querySelector('.menu-Option[data-fn-type="copyHref"]'),
     _copySrc = document.querySelector('.menu-Option[data-fn-type="copySrc"]'),
     _copyImg = document.querySelector('.menu-Option[data-fn-type="copyImg"]'),
-    _openTab = document.querySelector('.menu-Option[data-fn-type="openTab"]');
+    _openTab = document.querySelector('.menu-Option[data-fn-type="openTab"]'),
+    _backward = document.querySelector('#menuMusic .backward'),
+    _toggle = document.querySelector('#menuMusic .toggle'),
+    _forward = document.querySelector('#menuMusic .forward');
 
   const urlRegx = /^((https|http)?:\/\/)+[A-Za-z0-9]+\.[A-Za-z0-9]+[\/=\?%\-&_~`@[\]\':+!]*([^<>\"\"])*$/;
 
@@ -55,10 +57,27 @@ const RightMenu = (() => {
     }
 
     window.removeEventListener('blur', fn.hideMenu);
-    document.body.removeEventListener('click', fn.hideMenu);
-
     window.addEventListener('blur', fn.hideMenu);
+    document.body.removeEventListener('click', fn.hideMenu);
     document.body.addEventListener('click', fn.hideMenu);
+
+    if (_forward && _toggle && _forward) {
+      _backward.onclick = (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        RightMenuAplayer.aplayerBackward();
+      }
+      _toggle.onclick = (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        RightMenuAplayer.aplayerToggle();
+      }
+      _forward.onclick = (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        RightMenuAplayer.aplayerForward();
+      }
+    }
   }
 
   // 菜单位置设定