hexo-theme-volantis 5.0.0-rc.10 → 5.0.0-rc.100

package/_config.yml

@@ -1,7 +1,7 @@
 ############################### Volantis ###############################
 info:
   theme_name: Volantis # This is theme's name.
-  theme_version: '5.0.0-rc.10' # This is theme's version.
+  theme_version: '5.0.0-rc.100' # 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 调试模式
@@ -276,19 +276,19 @@ comments:
   # https://artalk.js.org/
   # https://github.com/ArtalkJS/Artalk
   artalk:
-    js: https://unpkg.com/artalk@2.1.3/dist/Artalk.js
-    css: https://unpkg.com/artalk@2.1.3/dist/Artalk.css
+    js: https://unpkg.com/artalk@2.1.9/dist/Artalk.js
+    css: https://unpkg.com/artalk@2.1.9/dist/Artalk.css
     server: http://127.0.0.1:8080/api    # 修改为自建的后端服务地址
     path:  # 全局评论地址
-    # 更多选项 https://artalk.js.org/guide/frontend/config.htm 按照yml格式继续填写即可 
+    # 更多选项 https://artalk.js.org/guide/frontend/config.html 按照yml格式继续填写即可 
     # 除了 [el pageKey pageTitle site] 选项
     # 下面是一些例子：
-    placeholder: 来啊，快活啊 ( ゜- ゜)   # 全局评论占位
-    noComment: 快来成为第一个评论的人吧~  # 评论为空时，评论列表显示字符
-    pagination:
-      readMore: true   # 加载更多模式
-      autoLoad: false  # 滚动到底部自动加载
-      pageSize: 10     # 每次请求获取数量
+    #placeholder: 来啊，快活啊 ( ゜- ゜)   # 全局评论占位
+    #noComment: 快来成为第一个评论的人吧~  # 评论为空时，评论列表显示字符
+    #pagination:
+    #  readMore: true   # 加载更多模式
+    #  autoLoad: false  # 滚动到底部自动加载
+    #  pageSize: 10     # 每次请求获取数量
     
   # giscus
   # https://giscus.app
@@ -901,6 +901,7 @@ rightmenus:
     - plugins.inputBox
     - plugins.seletctText
     - plugins.elementCheck
+    - plugins.elementImage
     - menus.link
     - hr
     - menus.darkMode
@@ -917,7 +918,7 @@ rightmenus:
   # 注： 
   # 1. link/event 二选一，同时出现时仅处理 link
   # 2. 内置事件列表： copyText, copyLink, copyPaste, copyAll, copyCut, copyImg, printMode, readMode
-  # 3. 内置组列表：navigation, inputBox, seletctText, elementCheck, articlePage
+  # 3. 内置组列表：navigation, inputBox, seletctText, elementCheck, elementImage, articlePage
   # 4. plugins 列允许自定义组内项目
   # 5. menus   列允许自定义组及其内容
   # 6. 除 navigation 外的内置组，在显示时会隐藏含 link 属性的菜单项
@@ -929,7 +930,10 @@ rightmenus:
     # 例外，在 articlePage 组显示时（文章页）时依旧显示含 link 属性的菜单项
     articleShowLink: false
     # 当设定全局音乐播放器时，是否一直显示音乐控制菜单。false：仅当音乐播放时启用
-    musicAlwaysShow: true
+    musicAlwaysShow: false
+    # 适用于复制图片文件的场景，当图片源未设置 Access-Control-Allow-Origin 时，图片复制由于 CORS 问题失败
+    # 你可以自行部署相应项目解决该问题，详见：https://github.com/Rob--W/cors-anywhere 或者 https://github.com/Zibri/cloudflare-cors-anywhere
+    corsAnywhere: 
   # 右键内置组，预置实现
   plugins:
     # 导航组件
@@ -953,12 +957,16 @@ rightmenus:
       - {id: 'searchWord', name: '站内搜索', icon: 'fa-solid fa-search', event: 'OpenSearch(__text__)', group: 'seletctText'}
       - {id: 'bingSearch', name: '必应搜索', icon: 'fa-solid fa-search', event: 'window.open(`https://cn.bing.com/search?q=${__text__}`)', group: 'seletctText'}
       #- {id: 'googleSearch', name: '谷歌搜索', icon: 'fa-solid fa-search', event: 'window.open(`https://www.google.com/search?q=${__text__}`)', group: 'seletctText'}
-    # 元素判断组件
-    # 生效于 a/img 处的右键行为，__link__ 为链接地址
+    # 链接判断组件
+    # 生效于链接处的右键行为，__link__ 为链接地址
     elementCheck:
       - {id: 'openTab', name: '新标签页打开', icon: 'fa-solid fa-external-link-square-alt', event: 'window.open(__link__)', group: 'elementCheck'}
       - {id: 'copyLink', name: '复制链接地址', icon: 'fa-solid fa-link', event: 'copyLink', group: 'elementCheck'}
-      - {id: 'copyImg', name: '复制图片文件', icon: 'fa-solid fa-image', event: 'copyImg', group: 'elementCheck'}
+    # 图片判断类组件
+    # 生效于图片类的右键行为，__link__ 为链接地址
+    elementImage:
+      - {id: 'copyImg', name: '复制图片', icon: 'fa-solid fa-image', event: 'copyImg', group: 'elementImage'}
+      - {id: 'googleImg', name: '谷歌识图', icon: 'fa-solid fa-images', event: 'window.open(`https://www.google.com.hk/searchbyimage?image_url=${__link__}`)', group: 'elementImage'}
     # 文章页面组件
     # 生效于 post.article 页面
     articlePage:

package/layout/_partial/scripts/index.ejs

@@ -64,9 +64,27 @@
   <%- partial('../../_plugins/aplayer/script') %>
 <% } %>
 
-<% if (theme.comments.service && theme.comments.service.length > 0) { %>
-  <%- partial('../../_plugins/comments/' + theme.comments.service + '/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.analytics.busuanzi) { %>
   <script defer src="<%- theme.analytics.busuanzi %>" data-pjax></script>

package/layout/_plugins/_page_plugins/index.ejs

@@ -1,7 +1,27 @@
-<%_(page.plugins||[]).forEach(function(item){  _%>
-  <%_if (typeof item == "string") {   _%>
-    <%- partial( item + "/index") %>
-  <%_}else if(typeof item == "object"){  _%>
-    <%- partial( Object.keys(item)[0] + "/index", { pagePlugin:item }) %>
-  <%_} _%>
-<%_ }) _%>
+<%_
+(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/rightmenus/layout.ejs

@@ -1,7 +1,7 @@
 <%
   const rightMenu = {
     defaultEvent: ['copyText', 'copyLink', 'copyPaste', 'copyAll', 'copyCut', 'copyImg', 'printMode', 'readMode'],
-    defaultGroup: ['navigation', 'inputBox', 'seletctText', 'elementCheck', 'articlePage'],
+    defaultGroup: ['navigation', 'inputBox', 'seletctText', 'elementCheck', 'elementImage', 'articlePage'],
     dataGet: (data, keyStr) => {
       const keys = keyStr.split('.');
       let currentData = data;
@@ -45,7 +45,7 @@
 
 <% rightMenu.loadMenu = item => { %>
 <%   if(item === undefined) { %>
-  <hr class="menuLoad-Content" >
+    <hr class="menuLoad-Content" >
 <%   } else if(item['id'] === undefined) { %>
     <hr class="menuLoad-Content" >
 <%   } else if(item['link'] === undefined) { %>
@@ -85,7 +85,7 @@
   <!-- RightMenusFunction['<%- item.id %>'] = (fun) => {fun()} -->
 <%     } else if (item['group'] === 'seletctText') { %>  
   RightMenusFunction['<%- item.id %>'] = (__text__) => {<%- item.event %>}
-<%     } else if (item['group'] === 'elementCheck') { %>  
+<%     } else if (item['group'] === 'elementCheck' || item['group'] === 'elementImage') { %>  
   RightMenusFunction['<%- item.id %>'] = (__link__) => {<%- item.event %>}
 <%     } else { %>  
   RightMenusFunction['<%- item.id %>'] = () => {<%- item.event %>}

package/package.json

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

package/source/js/app.js

@@ -637,7 +637,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, {

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();
-});
+});

package/source/js/plugins/rightMenus.js

@@ -1,9 +1,11 @@
 
 const RightMenus = {
   defaultEvent: ['copyText', 'copyLink', 'copyPaste', 'copyAll', 'copyCut', 'copyImg', 'printMode', 'readMode'],
-  defaultGroup: ['navigation', 'inputBox', 'seletctText', 'elementCheck', 'articlePage'],
+  defaultGroup: ['navigation', 'inputBox', 'seletctText', 'elementCheck', 'elementImage', 'articlePage'],
   messageRightMenu: volantis.GLOBAL_CONFIG.plugins.message.enable && volantis.GLOBAL_CONFIG.plugins.message.rightmenu.enable,
+  corsAnywhere: volantis.GLOBAL_CONFIG.plugins.rightmenus.options.corsAnywhere,
   urlRegx: /^((https|http)?:\/\/)+[A-Za-z0-9]+\.[A-Za-z0-9]+[\/=\?%\-&_~`@[\]\':+!]*([^<>\"\"])*$/,
+  imgRegx: /\.(jpe?g|png|webp|svg|gif|jifi)$/,
 
   /**
    * 加载右键菜单
@@ -73,7 +75,7 @@ const RightMenus = {
         })
       }, 'image/png')
     }, false)
-    image.src = link;
+    image.src = `${RightMenus.corsAnywhere ? RightMenus.corsAnywhere : ''}${link}`;
   },
 
   /**
@@ -116,12 +118,12 @@ RightMenus.fun = (() => {
     _rightMenuWrapper = document.getElementById('rightmenu-wrapper'),
     _rightMenuContent = document.getElementById('rightmenu-content'),
     _rightMenuList = document.querySelectorAll('#rightmenu-content li.menuLoad-Content'),
+    _rightMenuListWithHr = document.querySelectorAll('#rightmenu-content li, #rightmenu-content hr, #menuMusic'),
     _readBkg = document.getElementById('read_bkg'),
     _menuMusic = document.getElementById('menuMusic'),
     _backward = document.querySelector('#menuMusic .backward'),
     _toggle = document.querySelector('#menuMusic .toggle'),
-    _forward = document.querySelector('#menuMusic .forward'),
-    _menuHr = document.querySelectorAll('#rightmenu-content hr');
+    _forward = document.querySelector('#menuMusic .forward');
 
   // 公共数据
   let globalData = {
@@ -133,7 +135,7 @@ RightMenus.fun = (() => {
     linkUrl: '',
     isMediaLink: false,
     mediaLinkUrl: '',
-    isPngImg: false,
+    isImage: false,
     isArticle: false,
     pathName: '',
     isReadClipboard: false,
@@ -210,28 +212,31 @@ RightMenus.fun = (() => {
       if (globalData.statusCheck || globalData.isArticle) {
         switch (groupName) {
           case 'inputBox':
-            if (globalData.isInputBox) item.style.display = 'block';
-            if (itemEvent === 'copyCut' && !globalData.selectText) item.style.display = 'none';
-            // 判断剪切板是否包含文本
-            // Note: 异步? 导致了此处判断只能写这里（存在些微时间差）
-            if (itemEvent === 'copyPaste')
-              RightMenus.readClipboard().then(text => {
-                if (!!text) {
-                  globalData.isReadClipboard = true;
-                  globalData.readClipboard = text;
-                } else {
+            if (globalData.isInputBox) {
+              item.style.display = 'block';
+              if (itemEvent === 'copyCut' && !globalData.selectText) item.style.display = 'none';
+              if (itemEvent === 'copyAll' && !globalData.inputValue) item.style.display = 'none';
+              if (globalData.isInputBox && itemEvent === 'copyPaste')
+                RightMenus.readClipboard().then(text => {
+                  if (!!text) {
+                    globalData.isReadClipboard = true;
+                    globalData.readClipboard = text;
+                  } else {
+                    item.style.display = 'none';
+                  }
+                }).catch(() => {
                   item.style.display = 'none';
-                }
-              }).catch(() => {
-                item.style.display = 'none';
-              })
+                })
+            }
             break;
           case 'seletctText':
             if (!!globalData.selectText) item.style.display = 'block';
             break;
           case 'elementCheck':
             if (globalData.isLink || globalData.isMediaLink) item.style.display = 'block';
-            if (itemEvent === 'copyImg' && !globalData.isPngImg) item.style.display = 'none';
+            break;
+          case 'elementImage':
+            if (globalData.isImage) item.style.display = 'block';
             break;
           case 'articlePage':
             if (globalData.isArticle) item.style.display = 'block';
@@ -248,9 +253,28 @@ RightMenus.fun = (() => {
         item.style.display = 'block';
       }
     })
-    _menuHr.forEach(item => {
-      item.style.display = globalData.statusCheck ? 'none' : 'block';
+
+
+    let elementHrItem = { item: null, hide: true };
+    _rightMenuListWithHr.forEach((item) => {
+      if (item.nodeName === "HR") {
+        item.style.display = 'block';
+        if (!elementHrItem.item) {
+          elementHrItem.item = item;
+          return;
+        }
+        if (elementHrItem.hide || elementHrItem.item.nextElementSibling.nodeName === "hr") {
+          elementHrItem.item.style.display = 'none';
+        }
+        elementHrItem.item = item;
+        elementHrItem.hide = true;
+      } else {
+        if (item.style.display === 'block' && elementHrItem.hide) {
+          elementHrItem.hide = false;
+        }
+      }
     })
+    if (!!elementHrItem.item && elementHrItem.hide) elementHrItem.item.style.display = 'none';
   }
 
   /**
@@ -280,9 +304,9 @@ RightMenus.fun = (() => {
       globalData.mediaLinkUrl = event.target.currentSrc;
     }
 
-    // 判断是否为 png 格式的图片地址
-    if (globalData.isMediaLink) {
-      globalData.isPngImg = true;
+    // 判断是否为图片地址
+    if (globalData.isMediaLink && RightMenus.imgRegx.test(globalData.mediaLinkUrl)) {
+      globalData.isImage = true;
     }
 
     // 判断是否为文章页面
@@ -348,6 +372,8 @@ RightMenus.fun = (() => {
               RightMenusFunction[id](globalData.selectText)
             } else if (groupName === 'elementCheck') {
               RightMenusFunction[id](globalData.isLink ? globalData.linkUrl : globalData.mediaLinkUrl)
+            } else if (groupName === 'elementImage') {
+              RightMenusFunction[id](globalData.mediaLinkUrl)
             } else {
               RightMenusFunction[id]()
             }
@@ -471,18 +497,27 @@ RightMenus.fun = (() => {
   }
 
   fn.copyImg = () => {
+    if (volantis.GLOBAL_CONFIG.plugins.message.rightmenu.notice) {
+      VolantisApp.message('系统提示', '复制中，请等待。', {
+        icon: rightMenuConfig.options.iconPrefix + ' fa-images'
+      })
+    }
     RightMenus.writeClipImg(globalData.mediaLinkUrl, e => {
-      if (RightMenus.messageRightMenu)
+      if (RightMenus.messageRightMenu) {
+        VolantisApp.hideMessage();
         VolantisApp.message('系统提示', '图片复制成功！', {
           icon: rightMenuConfig.options.iconPrefix + ' fa-images'
         });
+      }
     }, (e) => {
       console.error(e);
-      if (RightMenus.messageRightMenu)
+      if (RightMenus.messageRightMenu) {
+        VolantisApp.hideMessage();
         VolantisApp.message('系统提示', '复制失败：' + e, {
           icon: rightMenuConfig.options.iconPrefix + ' fa-exclamation-square red',
           time: 9000
         });
+      }
     })
   }