hexo-theme-volantis 5.0.0-rc.9 → 5.2.0

package/scripts/tags/tabs.js

@@ -2,89 +2,88 @@
  * tabs.js | https://theme-next.org/docs/tag-plugins/tabs
  */
 
- 'use strict';
-
- function postTabs(args, content) {
-   var tabBlock = /<!--\s*tab (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtab\s*-->/g;
- 
-   if(/::/g.test(args)){
-     args = args.join(' ').split('::');
-   }
-   else{
-     args = args.join(' ').split(',');
-   }
-   var tabName = args[0];
-   var tabActive = Number(args[1]) || 0;
- 
-   var matches = [];
-   var match;
-   var tabId = 0;
-   var tabNav = '';
-   var tabContent = '';
- 
-   !tabName && hexo.log.warn('Tabs block must have unique name!');
- 
-   while ((match = tabBlock.exec(content)) !== null) {
-     matches.push(match[1]);
-     matches.push(match[2]);
-   }
- 
-   for (var i = 0; i < matches.length; i += 2) {
-     var tabParameters = matches[i].split('@');
-     var postContent   = matches[i + 1];
-     var tabCaption    = tabParameters[0] || '';
-     var tabIcon       = tabParameters[1] || '';
-     var tabHref       = '';
- 
- 
-     // 兼容aplayer插件 https://github.com/volantis-x/hexo-theme-volantis/issues/575
-     var aplayerTag=0
-     var aplayerTagReg=/\<div.*class=\"aplayer aplayer-tag-marker\"(.|\n)*\<\/script\>/g
-     if(/class="aplayer aplayer-tag-marker"/g.test(postContent)){
-       aplayerTag=aplayerTagReg.exec(postContent)[0]
-       postContent=postContent.replace(aplayerTagReg,"@aplayerTag@")
-     }
- 
-     // 兼容 gallery 标签
-     var fancyboxTag=0
-     var fancyboxTagReg = /\<div.*galleryFlag(.|\n)*\<\/span\>\<\/div\>\<\/div\>/g
-     if(/galleryFlag/g.test(postContent)) {
-       fancyboxTag=fancyboxTagReg.exec(postContent)[0]
-       postContent=postContent.replace(fancyboxTagReg,"@fancyboxTag@")
-     }
- 
-     postContent = hexo.render.renderSync({text: postContent, engine: 'markdown'}).trim();
- 
-     if(aplayerTag){
-       postContent=postContent.replace(/\<pre\>\<code\>.*@aplayerTag@.*\<\/code><\/pre>/,aplayerTag)
-     }
- 
-     if(fancyboxTag){
-       postContent=postContent.replace(/.*@fancyboxTag@.*/,fancyboxTag)
-     }
- 
-     tabId += 1;
-     tabHref = (tabName + ' ' + tabId).toLowerCase().split(' ').join('-');
- 
-     ((tabCaption.length === 0) && (tabIcon.length === 0)) && (tabCaption = tabName + ' ' + tabId);
- 
-     var isOnlyicon = tabIcon.length > 0 && tabCaption.length === 0 ? ' style="text-align: center;"' : '';
-     let icon = tabIcon.trim();
-     icon = icon.startsWith('fa') ? icon : 'fa fa-' + icon;
-     tabIcon.length > 0 && (tabIcon = `<i class="${icon}"${isOnlyicon}></i>`);
- 
-     var isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : '';
-     tabNav += `<li class="tab${isActive}"><a class="#${tabHref}">${tabIcon + tabCaption.trim()}</a></li>`;
-     tabContent += `<div class="tab-pane${isActive}" id="${tabHref}">${postContent}</div>`;
-   }
- 
-   tabNav = `<ul class="nav-tabs">${tabNav}</ul>`;
-   tabContent = `<div class="tab-content">${tabContent}</div>`;
-   // https://github.com/volantis-x/hexo-theme-volantis/issues/703
-   return `<div class="tabs" id="tab-${tabName.toLowerCase().split(' ').join('-')}">${tabNav + tabContent}</div>`;
- }
- 
- hexo.extend.tag.register('tabs', postTabs, {ends: true});
- hexo.extend.tag.register('subtabs', postTabs, {ends: true});
- hexo.extend.tag.register('subsubtabs', postTabs, {ends: true});
- 
+'use strict';
+
+function postTabs(args, content) {
+  var tabBlock = /<!--\s*tab (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtab\s*-->/g;
+
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
+  var tabName = args[0];
+  var tabActive = Number(args[1]) || 0;
+
+  var matches = [];
+  var match;
+  var tabId = 0;
+  var tabNav = '';
+  var tabContent = '';
+
+  !tabName && hexo.log.warn('Tabs block must have unique name!');
+
+  while ((match = tabBlock.exec(content)) !== null) {
+    matches.push(match[1]);
+    matches.push(match[2]);
+  }
+
+  for (var i = 0; i < matches.length; i += 2) {
+    var tabParameters = matches[i].split('@');
+    var postContent   = matches[i + 1];
+    var tabCaption    = tabParameters[0] || '';
+    var tabIcon       = tabParameters[1] || '';
+    var tabHref       = '';
+
+
+    // 兼容aplayer插件 https://github.com/volantis-x/hexo-theme-volantis/issues/575
+    var aplayerTag=0
+    var aplayerTagReg=/\<div.*class=\"aplayer aplayer-tag-marker\"(.|\n)*\<\/script\>/g
+    if(/class="aplayer aplayer-tag-marker"/g.test(postContent)){
+      aplayerTag=aplayerTagReg.exec(postContent)[0]
+      postContent=postContent.replace(aplayerTagReg,"@aplayerTag@")
+    }
+
+    // 兼容 gallery 标签
+    var fancyboxTag=0
+    var fancyboxTagReg = /\<div.*galleryFlag(.|\n)*\<\/span\>\<\/div\>\<\/div\>/g
+    if(/galleryFlag/g.test(postContent)) {
+      fancyboxTag=fancyboxTagReg.exec(postContent)[0]
+      postContent=postContent.replace(fancyboxTagReg,"@fancyboxTag@")
+    }
+
+    postContent = hexo.render.renderSync({text: postContent, engine: 'markdown'}).trim();
+
+    if(aplayerTag){
+      postContent=postContent.replace(/\<pre\>\<code\>.*@aplayerTag@.*\<\/code><\/pre>/,aplayerTag)
+    }
+
+    if(fancyboxTag){
+      postContent=postContent.replace(/.*@fancyboxTag@.*/,fancyboxTag)
+    }
+
+    tabId += 1;
+    tabHref = (tabName + ' ' + tabId).toLowerCase().split(' ').join('-');
+
+    ((tabCaption.length === 0) && (tabIcon.length === 0)) && (tabCaption = tabName + ' ' + tabId);
+
+    var isOnlyicon = tabIcon.length > 0 && tabCaption.length === 0 ? ' style="text-align: center;"' : '';
+    let icon = tabIcon.trim();
+    icon = icon.startsWith('fa') ? icon : 'fa fa-' + icon;
+    tabIcon.length > 0 && (tabIcon = `<i class="${icon}"${isOnlyicon}></i>`);
+
+    var isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : '';
+    tabNav += `<li class="tab${isActive}"><a class="#${tabHref}">${tabIcon + tabCaption.trim()}</a></li>`;
+    tabContent += `<div class="tab-pane${isActive}" id="${tabHref}">${postContent}</div>`;
+  }
+
+  tabNav = `<ul class="nav-tabs">${tabNav}</ul>`;
+  tabContent = `<div class="tab-content">${tabContent}</div>`;
+  // https://github.com/volantis-x/hexo-theme-volantis/issues/703
+  return `<div class="tabs" id="tab-${tabName.toLowerCase().split(' ').join('-')}">${tabNav + tabContent}</div>`;
+}
+
+hexo.extend.tag.register('tabs', postTabs, {ends: true});
+hexo.extend.tag.register('subtabs', postTabs, {ends: true});
+hexo.extend.tag.register('subsubtabs', postTabs, {ends: true});

package/source/css/_defines/AutoPrefixCSS.styl

@@ -1,4 +1,4 @@
-// AutoPrefixCSS  
+// AutoPrefixCSS
 // https://github.com/stylus/nib
 
 vendor-prefixes ?= webkit khtml moz o ms
@@ -15,7 +15,7 @@ vendor(prop, only = null ,vendor-property = true, args)
 
 animation()
   vendor(prop:'animation', only: null,  vendor-property: true, args:arguments)
-  
+
 // B
 box-orient()
   vendor(prop:'box-orient', only: webkit moz ms official,  vendor-property: true, args:arguments)
@@ -28,7 +28,7 @@ border-radius()
 
 box-shadow()
   vendor(prop:'box-shadow', only: webkit official,  vendor-property: true, args:arguments)
-  
+
 border-image()
   vendor(prop:'border-image', only: webkit moz o official,  vendor-property: true, args:arguments)
 
@@ -43,7 +43,7 @@ box-sizing()
 
 backface-visibility()
   vendor(prop:'backface-visibility', only: webkit moz ms official,  vendor-property: true, args:arguments)
-  
+
 background-size()
   vendor(prop:'background-size', only: webkit moz official,  vendor-property: true, args:arguments)
 
@@ -116,7 +116,7 @@ display(value)
     display -ms-flexbox     /* TWEENER - IE 10 */
     display -webkit-flex    /* NEW - Chrome */
     display flex        /* NEW, Spec - Opera 12.1, Firefox 20+ */
-     
+
   if arguments != 'flex'
     display: arguments;
   else
@@ -160,7 +160,7 @@ flex-direction(value)
   -webkit-flex-direction value
   -ms-flex-direction value
   flex-direction value
-  
+
 flexbox(value)
   // Initializing a flexbox container
   display -webkit-box    /* OLD - iOS 6-, Safari 3.1-6 */
@@ -227,7 +227,7 @@ flex-group(value)
   -ms-flex-order value
   -webkit-order value
   order value
-  
+
 flex-self(value)
   // Function for aligning the flex elements (align-self)
   if value == start or value == end
@@ -265,8 +265,8 @@ flex-justify(value)
     -webkit-justify-content value
     -ms-flex-pack distribute
     justify-content value
-    
-  
+
+
 font-smoothing()
   vendor(prop:'font-smoothing', only: webkit,  vendor-property: true, args:arguments)
 // G
@@ -305,22 +305,22 @@ print-color-adjust()
 // T
 text-size-adjust()
   vendor(prop:'text-size-adjust', only: null,  vendor-property: true, args:arguments)
-  
+
 transition()
-  vendor(prop:'transition', only: null,  vendor-property: true, args:arguments) 
-  
+  vendor(prop:'transition', only: null,  vendor-property: true, args:arguments)
+
 transition-property()
   vendor(prop:'transition-property', only: null,  vendor-property: true, args:arguments)
-  
+
 transition-duration()
   vendor(prop:'transition-duration', only: null,  vendor-property: true, args:arguments)
-  
+
 transition-timing-function()
   vendor(prop:'transition-timing-function', only: null,  vendor-property: true, args:arguments)
-  
+
 transition-delay()
   vendor(prop:'transition-delay', only: null,  vendor-property: true, args:arguments)
-  
+
 transform()
   vendor(prop:'transform', only: null,  vendor-property: true, args:arguments)
 

package/source/css/_first/base_first.styl

@@ -105,6 +105,12 @@ button
     background: alpha($color-card, .9) !important
     backdrop-filter: saturate(200%) blur(20px)
 
+if hexo-config('comments.service')=='discuss' || hexo-config('comments.service')=='twikoo' || hexo-config('comments.service')=='waline'
+  .blur#comments
+    @supports (backdrop-filter: blur(20px))
+      backdrop-filter: unset
+  #layoutHelper-comments
+    margin-bottom: 100px
 
 .shadow
   box-shadow: $boxshadow-card

package/source/css/_first/navbar_first.styl

@@ -28,7 +28,7 @@
 
     .nav-main
       trans()
-    
+
     // https://github.com/volantis-x/hexo-theme-volantis/issues/658
     &.sub .nav-main
       transform: translateY(0 - 1 * $navbar-height)

package/source/css/_style/_base/base.styl

@@ -1,5 +1,5 @@
 :root
-  // tag plugin from stellar 
+  // tag plugin from stellar
   --block-hover: mix($c-block-light, $c-text-light, 98)
   --text-p1: $c-text-light
   --text-p3: mix($c-text-light, $c-site-bg-light, 60)

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

@@ -83,7 +83,7 @@
   &:empty
     display:none
 
-  .toc-child 
+  .toc-child
     font-size: 1rem
     overflow: hidden
     transition: max-height 0.6s ease-in
@@ -93,5 +93,5 @@
       &>.toc-link
         list_active()
         border-left: $border-line solid $color-theme
-      &>.toc-child 
+      &>.toc-child
         max-height: 1000px

package/source/css/_style/_plugins/_dark/dark_async.styl

@@ -1,7 +1,7 @@
 // 异步加载的暗黑模式 暗黑模式 CSS 变量
 
 async_dark()
-  // tag plugin from stellar 
+  // tag plugin from stellar
   --block-hover: mix($c-block-dark, $c-text-dark, 95)
   --text-p1: $c-text-dark
   --text-p3: mix($c-text-light, $c-site-bg-light, 60)

package/source/css/_style/_plugins/_dark/dark_plugins.styl

@@ -8,7 +8,7 @@ fa-thin,
 fal,
 fad,
 fa,
-svg.iconfont,    
+svg.iconfont,
 img,
 .lazyload
   filter: brightness(convert(hexo-config('color_scheme.dark.brightness'))) !important
@@ -57,7 +57,7 @@ if hexo-config('plugins.code_highlight') == "highlightjs"
   border-color: var(--color-site-bg) !important
 blockquote p
   color: var(--color-p)
-  
+
 // tags
 #archive-page .archive .all-tags ul li span
   color: var(--color-text)
@@ -111,7 +111,7 @@ if hexo-config('comments.service')=='twikoo'
         border-top: 1px solid #4a4b50 !important
         background:#4a4b50 !important
         color: #ccc !important
-        .OwO-packages 
+        .OwO-packages
           li:hover
             background-color: #252627 !important
           .OwO-package-active
@@ -123,10 +123,14 @@ if hexo-config('comments.service')=='twikoo'
       .OwO-items-image
         .OwO-item:hover
           background-color: #252627 !important
+          
+if hexo-config('comments.service')=='discuss'
+  #Discuss .D-emot
+    background: #333841
 
 // Custom Files
 for $injects_dark in hexo-config('injects.dark')
   @import $injects_dark;
 // eg:
 // body
-//   --color-site-body: blue !important
+//   --color-site-body: blue !important

package/source/css/_style/_plugins/_rightmenu/reading.styl

@@ -36,8 +36,8 @@
   transition: opacity 1s cubic-bezier(.23,1,.32,1) 0ms !important
 
 .common_read_hide
-  opacity: 0 !important  
-  z-index: -2147483645 !important  
+  opacity: 0 !important
+  z-index: -2147483645 !important
 
 .common_read_main
   width: 840px !important;

package/source/css/_style/_plugins/_rightmenu/rightmenu.styl

@@ -37,7 +37,7 @@ ul.list-v.rightmenu
     &:active,&.active
       list_active()
     &:hover
-      list_hover()  
+      list_hover()
   li.navigation, li.music
     display: flex
     justify-content: space-between

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

@@ -38,7 +38,7 @@
     color: $color-md-blue-grey
   &.yellow
     color: $color-md-yellow
-    
+
   &.TURQUOISE
     color: #1abc9c
   &.EMERALD

package/source/css/first.styl

@@ -3,17 +3,15 @@
 }
 // https://web.dev/content-visibility/
 // https://www.caniuse.com/?search=content-visibility
-/* 
+/*
   * Workaround for Chrome bug, part 1
   * Chunk rendering for all but the first article.
   * /layout/_partial/scripts/content-visibility-scroll-fix.ejs
 */
-// https://github.com/volantis-x/hexo-theme-volantis/issues/693#issuecomment-987667610
-if !hexo-config('plugins.scrollreveal.enable')
-  .post-story + .post-story, article + article , .post-wrapper + .post-wrapper{
-    content-visibility: auto;
-    contain-intrinsic-size: 10px 500px;
-  }
+.post-story + .post-story{
+  content-visibility: auto;
+  contain-intrinsic-size: 10px 500px;
+}
 
 @import '_defines/*'
 

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' })
+          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' })
+          volantis.scroll.to(target, { addTop: 5, behavior: 'instant', observer:true })
         }
       }, 1000)
     }
@@ -295,7 +295,7 @@ const VolantisApp = (() => {
             let array = e.currentTarget.children
             for (let index = 0; index < array.length; index++) {
               const element = array[index];
-              if (volantis.dom.$(element).title === 'menu') { // 移动端菜单栏异常  
+              if (volantis.dom.$(element).title === 'menu') { // 移动端菜单栏异常
                 volantis.dom.$(element).display = "flex"      // https://github.com/volantis-x/hexo-theme-volantis/issues/706
               } else {
                 volantis.dom.$(element).show()
@@ -437,36 +437,32 @@ const VolantisApp = (() => {
 
   // 工具类：复制字符串到剪切板
   fn.utilWriteClipText = (str) => {
-    try {
-      return navigator.clipboard
-        .writeText(str)
-        .then(() => {
-          return Promise.resolve()
-        })
-        .catch(err => {
-          return Promise.reject(err || '复制文本失败!')
-        })
-    } catch (e) {
-      const input = document.createElement('input');
-      input.setAttribute('readonly', 'readonly');
-      document.body.appendChild(input);
-      input.setAttribute('value', str);
-      input.select();
-      try {
-        let result = document.execCommand('copy')
-        document.body.removeChild(input);
-        if (!result || result === 'unsuccessful') {
-          return Promise.reject('复制文本失败!')
-        } else {
-          return Promise.resolve()
+    return navigator.clipboard
+      .writeText(str)
+      .then(() => {
+        return Promise.resolve()
+      })
+      .catch(e => {
+        const input = document.createElement('textarea');
+        input.setAttribute('readonly', 'readonly');
+        document.body.appendChild(input);
+        input.innerHTML = str;
+        input.select();
+        try {
+          let result = document.execCommand('copy')
+          document.body.removeChild(input);
+          if (!result || result === 'unsuccessful') {
+            return Promise.reject('复制文本失败!')
+          } else {
+            return Promise.resolve()
+          }
+        } catch (e) {
+          document.body.removeChild(input);
+          return Promise.reject(
+            '当前浏览器不支持复制功能，请检查更新或更换其他浏览器操作!'
+          )
         }
-      } catch (e) {
-        document.body.removeChild(input);
-        return Promise.reject(
-          '当前浏览器不支持复制功能，请检查更新或更换其他浏览器操作!'
-        )
-      }
-    }
+      })
   }
 
   // 工具类：返回时间间隔
@@ -637,7 +633,7 @@ const VolantisApp = (() => {
     // 消息提示 复制时弹出
     if (volantis.GLOBAL_CONFIG.plugins.message.enable
       && volantis.GLOBAL_CONFIG.plugins.message.copyright.enable
-      && messageCopyrightShow < 3) {
+      && messageCopyrightShow < 1) {
       messageCopyrightShow++;
       VolantisApp.message(volantis.GLOBAL_CONFIG.plugins.message.copyright.title,
         volantis.GLOBAL_CONFIG.plugins.message.copyright.message, {
@@ -809,12 +805,12 @@ Object.freeze(VolantisFancyBox);
 
 // highlightKeyWords 与 搜索功能搭配 https://github.com/next-theme/hexo-theme-next/blob/eb194a7258058302baf59f02d4b80b6655338b01/source/js/third-party/search/local-search.js
 // Question: 锚点稳定性未知
-// ToDo: 查找模式 
+// ToDo: 查找模式
 // 0. (/////////要知道浏览器自带全页面查找功能 CTRL + F)
 // 1. 右键开启查找模式 / 导航栏菜单开启?? / CTRL + F ???
 // 2. 查找模式面板 (可拖动? or 固定?)
 // 3. keyword mark id 从 0 开始编号 查找下一处 highlightKeyWords.scrollToNextHighlightKeywordMark() 查找上一处 scrollToPrevHighlightKeywordMark() 循环查找(取模%)
-// 4. 可输入修改 查找关键词 keywords(type:list) 
+// 4. 可输入修改 查找关键词 keywords(type:list)
 // 5. 区分大小写 caseSensitive (/ 全字匹配?? / 正则匹配??)
 // 6. 在选定区域中查找 querySelector ??
 // 7. 关闭查找模式
@@ -834,6 +830,7 @@ const highlightKeyWords = (() => {
     fn.scrollToFirstHighlightKeywordMark()
   }
   fn.scrollToFirstHighlightKeywordMark = () => {
+    volantis.cleanContentVisibility();
     let target = fn.scrollToNextHighlightKeywordMark("0");
     if (!target) {
       volantis.requestAnimationFrame(fn.scrollToFirstHighlightKeywordMark)

package/source/js/plugins/aplayer.js

@@ -43,11 +43,9 @@ const RightMenuAplayer = (() => {
       });
       APlayer.player.on('volumechange', function (e) {
         fn.onUpdateAPlayerVolume(e);
-        APlayer.status = 'volumechange';
       });
       APlayer.player.on('loadstart', function (e) {
         fn.updateTitle(e);
-        APlayer.status = 'loadstart';
       });
 
       // 监听音量手势
@@ -185,4 +183,4 @@ Object.freeze(RightMenuAplayer);
 
 volantis.requestAnimationFrame(() => {
   RightMenuAplayer.checkAPlayer();
-});
+});