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

package/source/js/plugins/rightMenu.js

@@ -80,7 +80,7 @@ const RightMenu = (() => {
     }
   }
 
-  // 菜单位置设定 
+  // 菜单位置设定
   fn.popMenu = (event) => {
     let mouseClientX = event.clientX;
     let mouseClientY = event.clientY;
@@ -123,18 +123,18 @@ const RightMenu = (() => {
       });
   }
 
-  // 菜单项设置 
+  // 菜单项设置
   fn.setMenuItem = (event) => {
     let optionFlag = false;
     const eventTarget = event.target;
     const selectText = window.getSelection().toString();
-    DOMController.visible(_openTab, false); // 隐藏新标签页打开 
+    DOMController.visible(_openTab, false); // 隐藏新标签页打开
 
-    // 判断是否是输入框 
+    // 判断是否是输入框
     if (eventTarget.tagName.toLowerCase() === 'input' || eventTarget.tagName.toLowerCase() === 'textarea') {
       const inputStr = eventTarget.value;
 
-      // 全选 
+      // 全选
       if (inputStr.length > 0) {
         DOMController.visible(_copySelect);
         _copySelect.onclick = () => {
@@ -145,7 +145,7 @@ const RightMenu = (() => {
         DOMController.visible(_copySelect, false);
       }
 
-      // 剪切 
+      // 剪切
       if (selectText) {
         DOMController.visible(_copyCut);
         _copyCut.onclick = () => {
@@ -161,9 +161,9 @@ const RightMenu = (() => {
         DOMController.visible(_copyCut, false);
       }
 
-      // 粘贴 
+      // 粘贴
       fn.readClipboard().then(text => {
-        // 如果剪切板存在内容 
+        // 如果剪切板存在内容
         if (!!text) {
           DOMController.visible(_copyPaste);
           _copyPaste.onclick = () => {
@@ -182,7 +182,7 @@ const RightMenu = (() => {
       DOMController.visible(_copyCut, false);
     }
 
-    // 新标签打开链接 
+    // 新标签打开链接
     const eventHref = eventTarget.href;
     if (!!eventHref && urlRegx.test(eventHref)) {
       optionFlag = true;
@@ -198,7 +198,7 @@ const RightMenu = (() => {
       DOMController.visible(_copyHref, false);
     }
 
-    // 新标签打开图片 & 复制图片链接 
+    // 新标签打开图片 & 复制图片链接
     const eventSrc = eventTarget.currentSrc;
     if (!!eventSrc && urlRegx.test(eventSrc)) {
       optionFlag = true;
@@ -216,7 +216,7 @@ const RightMenu = (() => {
       DOMController.visible(_copySrc, false);
     }
 
-    // 复制图片 
+    // 复制图片
     if (!!eventSrc && urlRegx.test(eventSrc) && eventSrc.trimEnd().endsWith('.png')) {
       optionFlag = true;
       DOMController.visible(_copyImg);
@@ -236,7 +236,7 @@ const RightMenu = (() => {
       DOMController.visible(_copyImg, false);
     }
 
-    // 复制文本 
+    // 复制文本
     if (selectText) {
       optionFlag = true;
       DOMController.visible(_copyText);
@@ -254,7 +254,7 @@ const RightMenu = (() => {
       DOMController.visible(_searchWord, false);
     }
 
-    // 打印 
+    // 打印
     const _printArticle = document.querySelector('#post.article') || null;
     const pathName = window.location.pathname;
     if (!!_printArticle) {
@@ -314,12 +314,12 @@ const RightMenu = (() => {
     }
   }
 
-  // 隐藏菜单 
+  // 隐藏菜单
   fn.hideMenu = () => {
     DOMController.visible(_rightMenuWrapper, false);
   }
 
-  // 复制字符串 
+  // 复制字符串
   fn.copyString = (str) => {
     VolantisApp.utilWriteClipText(str)
       .then(() => {
@@ -335,7 +335,7 @@ const RightMenu = (() => {
       })
   }
 
-  // 写入文本到剪切板 
+  // 写入文本到剪切板
   fn.writeClipText = (str) => {
     try {
       return navigator.clipboard
@@ -369,7 +369,7 @@ const RightMenu = (() => {
     }
   }
 
-  // 写入图片到剪切板 
+  // 写入图片到剪切板
   fn.writeClipImg = async function (event, success, error) {
     const eventSrc = rightMenuConfig.customPicUrl.enable ?
       event.target.currentSrc.replace(rightMenuConfig.customPicUrl.old, rightMenuConfig.customPicUrl.new) :
@@ -413,14 +413,14 @@ const RightMenu = (() => {
     }
   }
 
-  // 请求读取剪切板 
+  // 请求读取剪切板
   fn.readClipboard = async () => {
     const result = await navigator.permissions.query({
       name: 'clipboard-read'
     });
     if (result.state === 'granted' || result.state === 'prompt') {
-      // 修改为 .read()  可以获取剪切板中的文字/图片 
-      // 返回的是 ClipboardItem 
+      // 修改为 .read()  可以获取剪切板中的文字/图片
+      // 返回的是 ClipboardItem
       return navigator.clipboard
         .readText()
         .then(text => text)
@@ -429,7 +429,7 @@ const RightMenu = (() => {
     return Promise.reject(result);
   }
 
-  // 粘贴文本 
+  // 粘贴文本
   fn.insertAtCaret = (elemt, value) => {
     const startPos = elemt.selectionStart,
       endPos = elemt.selectionEnd;
@@ -453,7 +453,7 @@ const RightMenu = (() => {
     }
   }
 
-  // 执行打印页面 
+  // 执行打印页面
   fn.printHtml = () => {
     if (volantis.isReadModel) fn.readingModel();
     DOMController.setAttribute('details', 'open', 'true');

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)(-|_|!|\?|\/)?.*$/,
 
   /**
    * 加载右键菜单
@@ -21,21 +23,23 @@ const RightMenus = {
    * @returns text
    */
   readClipboard: async () => {
-    const result = await navigator.permissions.query({
-      name: 'clipboard-read'
-    });
-    if (result.state === 'granted' || result.state === 'prompt') {
-      return navigator.clipboard
-        .readText()
-        .then(text => text)
-        .catch(err => Promise.reject(err));
+    let clipboardText;
+    const result = await navigator.permissions.query({ name: 'clipboard-read' });
+    switch (result.state) {
+      case 'granted':
+      case 'prompt':
+        clipboardText = await navigator.clipboard.readText()
+        break;
+      default:
+        window.clipboardRead = false;
+        break;
     }
-    return Promise.reject(result);
+    return clipboardText;
   },
 
   /**
    * 写入文本到剪切板
-   * @param {String} text 
+   * @param {String} text
    */
   writeClipText: text => {
     return navigator.clipboard
@@ -50,41 +54,36 @@ const RightMenus = {
 
   /**
    * 写入图片到剪切板
-   * @param {*} link 
-   * @param {*} success 
-   * @param {*} error 
+   * @param {*} link
+   * @param {*} success
+   * @param {*} error
    */
   writeClipImg: async (link, success, error) => {
-    try {
-      // 如果使用了cdn的自适应Webp，png格式的图片会返回image/webp导致复制失败
-      // 伪装一个旧版本的Safari浏览器，同时添加time用以避免获取缓存文件
-      // 请求头里设置no-cache造成了莫名其妙的cors问题
-      const data = await fetch(`${link}?time=${Date.now()}`, {
-        mode: 'cors',
-        headers: {
-          "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Safari/605.1.15"
-        }
-      });
-      const blob = await data.blob();
-      await navigator.clipboard
-        .write([
-          new ClipboardItem({
-            [blob.type]: blob
-          })
-        ]).then(() => {
-          success(true);
-        }, (e) => {
-          error(blob.type !== 'image/png' ? '当前文件类型不正确，不支持复制。' : e);
-        });
-    } catch (e) {
-      error(e)
-    }
+    const image = new Image;
+    image.crossOrigin = "Anonymous";
+    image.addEventListener('load', () => {
+      let canvas = document.createElement("canvas");
+      let context = canvas.getContext("2d");
+      canvas.width = image.width;
+      canvas.height = image.height;
+      context.drawImage(image, 0, 0);
+      canvas.toBlob(blob => {
+        navigator.clipboard.write([
+          new ClipboardItem({ 'image/png': blob })
+        ]).then(e => {
+          success(e)
+        }).catch(e => {
+          error(e)
+        })
+      }, 'image/png')
+    }, false)
+    image.src = `${link}?(lll￢ω￢)`;
   },
 
   /**
    * 粘贴文本到剪切板
-   * @param {*} elemt 
-   * @param {*} value 
+   * @param {*} elemt
+   * @param {*} value
    */
   insertAtCaret: (elemt, value) => {
     const startPos = elemt.selectionStart,
@@ -121,12 +120,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 = {
@@ -138,11 +137,10 @@ RightMenus.fun = (() => {
     linkUrl: '',
     isMediaLink: false,
     mediaLinkUrl: '',
-    isPngImg: false,
+    isImage: false,
     isArticle: false,
     pathName: '',
-    isReadClipboard: false,
-    readClipboard: '',
+    isReadClipboard: true,
     isShowMusic: false,
     statusCheck: false
   }
@@ -171,7 +169,7 @@ RightMenus.fun = (() => {
 
   /**
    * 右键菜单位置设定
-   * @param {*} event 
+   * @param {*} event
    */
   fn.menuPosition = (event) => {
     try {
@@ -202,7 +200,7 @@ RightMenus.fun = (() => {
 
   /**
    * 菜单项控制
-   * @param {*} event 
+   * @param {*} event
    */
   fn.menuControl = (event) => {
     fn.globalDataSet(event);
@@ -215,28 +213,21 @@ 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 {
-                  item.style.display = 'none';
-                }
-              }).catch(() => {
-                item.style.display = 'none';
-              })
+            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 (itemEvent === 'copyPaste' && !globalData.isReadClipboard) 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';
@@ -253,14 +244,37 @@ RightMenus.fun = (() => {
         item.style.display = 'block';
       }
     })
-    _menuHr.forEach(item => {
-      item.style.display = globalData.statusCheck ? 'none' : 'block';
+
+    // 执行外部事件
+    volantis.mouseEvent = event;
+    volantis.rightmenu.method.handle.start()
+
+    // 过滤 HR 元素
+    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';
   }
 
   /**
    * 元素状态判断/全局数据设置
-   * @param {*} event 
+   * @param {*} event
    */
   fn.globalDataSet = (event) => {
     globalData = Object.assign({}, globalDataBackup);
@@ -273,6 +287,11 @@ RightMenus.fun = (() => {
       globalData.inputValue = event.target.value;
     }
 
+    // 判断是否允许读取剪切板
+    if (globalData.isInputBox && window.clipboardRead === false) {
+      globalData.isReadClipboard = false;
+    }
+
     // 判断是否包含链接
     if (!!event.target.href && RightMenus.urlRegx.test(event.target.href)) {
       globalData.isLink = true;
@@ -285,9 +304,9 @@ RightMenus.fun = (() => {
       globalData.mediaLinkUrl = event.target.currentSrc;
     }
 
-    // 判断是否为 png 格式的图片地址
-    if (globalData.isMediaLink && globalData.mediaLinkUrl.trimEnd().endsWith('.png')) {
-      globalData.isPngImg = true;
+    // 判断是否为图片地址
+    if (globalData.isMediaLink && RightMenus.imgRegx.test(globalData.mediaLinkUrl)) {
+      globalData.isImage = true;
     }
 
     // 判断是否为文章页面
@@ -353,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]()
             }
@@ -460,8 +481,15 @@ RightMenus.fun = (() => {
     globalData.mouseEvent.target.select();
   }
 
-  fn.copyPaste = () => {
-    RightMenus.insertAtCaret(globalData.mouseEvent.target, globalData.readClipboard);
+  fn.copyPaste = async () => {
+    const result = await RightMenus.readClipboard() || '';
+    if (RightMenus.messageRightMenu && window.clipboardRead === false) {
+      VolantisApp.message('系统提示', '未授予剪切板读取权限！');
+    } else if (RightMenus.messageRightMenu && result === '') {
+      VolantisApp.message('系统提示', '仅支持复制文本内容！');
+    } else {
+      RightMenus.insertAtCaret(globalData.mouseEvent.target, result);
+    }
   }
 
   fn.copyCut = () => {
@@ -476,18 +504,27 @@ RightMenus.fun = (() => {
   }
 
   fn.copyImg = () => {
-    RightMenus.writeClipImg(globalData.mediaLinkUrl, flag => {
-      if (flag && RightMenus.messageRightMenu)
+    if (volantis.GLOBAL_CONFIG.plugins.message.rightmenu.notice) {
+      VolantisApp.message('系统提示', '复制中，请等待。', {
+        icon: rightMenuConfig.options.iconPrefix + ' fa-images'
+      })
+    }
+    RightMenus.writeClipImg(globalData.mediaLinkUrl, e => {
+      if (RightMenus.messageRightMenu) {
+        VolantisApp.hideMessage();
         VolantisApp.message('系统提示', '图片复制成功！', {
           icon: rightMenuConfig.options.iconPrefix + ' fa-images'
         });
-    }, (error) => {
-      console.error(error);
-      if (RightMenus.messageRightMenu)
-        VolantisApp.message('系统提示', '复制失败：' + error, {
+      }
+    }, (e) => {
+      console.error(e);
+      if (RightMenus.messageRightMenu) {
+        VolantisApp.hideMessage();
+        VolantisApp.message('系统提示', '复制失败：' + e, {
           icon: rightMenuConfig.options.iconPrefix + ' fa-exclamation-square red',
           time: 9000
         });
+      }
     })
   }
 
@@ -556,7 +593,7 @@ 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'; // 单独修改 
+      document.querySelector('.prev-next').style.display = 'flex'; // 单独修改
     }
   }
 

package/source/js/search/hexo.js

@@ -87,6 +87,9 @@ 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 (fn.contentSearch(post)) {
         html += fn.buildResult(post.permalink, post.title, post.digest);
       }

package/layout/_partial/scripts/import.ejs

@@ -1,3 +0,0 @@
-<% (config.import.script||[]).forEach(function(item) { %>
-  <%- item %>
-<% }) %>