hexo-theme-volantis 4.3.1 → 5.0.0-alpha.112

package/scripts/tags/dropmenu.js

@@ -1,7 +1,12 @@
 'use strict';
 
 function postMenu(args, content) {
-  args = args.join(' ').split(',');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   if (args.length == 1) {
     const title = args[0].trim();
     return `<div class='dropmenu-wrapper'>
@@ -41,7 +46,12 @@ function postMenu(args, content) {
   }
 }
 function postSubmenu(args, content) {
-  args = args.join(' ').split(',');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   const text = args[0] || '';
   const icon = args[1] || '';
   if (icon.length > 0) {
@@ -65,7 +75,12 @@ function postSubmenu(args, content) {
 }
 
 function postMenuItem(args) {
-  args = args.join(' ').split(',');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   let text = args[0] || '';
   let url = args[1] || '';
   text = text.trim();

package/scripts/tags/fancybox.js

@@ -1,18 +1,52 @@
 'use strict';
 
+function renderImg(content) {
+  return `${hexo.render.renderSync({text: content, engine: 'markdown'}).split('\n').join('')}`;
+}
+
+function buidAlt(alt) {
+  if (!!alt && alt !== 'image') {
+    return `<span class='image-caption'>${alt}</span>`
+  } else {
+    return '<span></span>';
+  }
+}
+
+function buidImgFancybox(content, group) {
+  let html = renderImg(content).trim();
+  if(html.startsWith('<p>') &&  html.endsWith('</p>')) {  // 去除无用的 p 标签包裹
+    html=html.substring(0, html.length-4).substring(3);
+  }
+
+  let imageTags = html.includes('image-caption') ? 'image' : undefined;
+  let imgList = html.match(/<img.*?>/g) || [];
+  imgList.forEach(item => {
+    const url = (item.match(/\ssrc=['"](.*?)['"]/) || [])[1];
+    const alt = (item.match(/\salt=['"](.*?)['"]/) || [])[1];
+    const newItem = item.replace('img', 'img fancybox itemprop="contentUrl"');  // 避免出现重复替换，打个标
+    const result = `<div class='fancybox'><a class='fancybox' pjax-fancybox itemscope itemtype="http://schema.org/ImageObject" itemprop="url" href='${url}' data-fancybox='${group}' data-caption='${alt}'>${newItem}</a>${buidAlt(imageTags || alt)}</div>`;
+    html = html.replace(item, result.trim());
+  })
+  return html;
+}
+
 function postFancybox(args, content) {
-  args = args.join(' ').split(',');
-  var cls = args[0];
-  var col = Number(args[1]) || 0;
-  if (col > 0) {
-    return `<div class="gallery ${cls}" col='${col}'>
-              ${hexo.render.renderSync({text: content, engine: 'markdown'}).split('\n').join('')}
-            </div>`;
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
   }
-  return `<div class="gallery ${cls}">
-              ${hexo.render.renderSync({text: content, engine: 'markdown'}).split('\n').join('')}
-            </div>`;
+  else{
+    args = args.join(' ').split(',');
+  }
+  const cls = args[0];
+  const col = Number(args[1]) || 0;
+  const group = (args[2] || 'default').trim();
 
+  if (col > 0) {
+    return `<div galleryFlag itemscope itemtype="http://schema.org/ImageGallery" class="gallery ${cls}" col='${col}' data-group='${group}'>${buidImgFancybox(content, group)}</div>`;
+  }
+  return `<div galleryFlag itemscope itemtype="http://schema.org/ImageGallery" class="gallery ${cls}" data-group='${group}'>${buidImgFancybox(content, group)}</div>`;
 }
 
+
+
 hexo.extend.tag.register('gallery', postFancybox, {ends: true});

package/scripts/tags/folding.js

@@ -1,7 +1,12 @@
 'use strict';
 
 function postFolding(args, content) {
-  args = args.join(' ').split(',');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   let style = '';
   let title = '';
   if (args.length > 1) {

package/scripts/tags/frame.js

@@ -13,7 +13,12 @@
 // {% frame device | video=xxx | part=bottom %}
 // device: iphone11,
 hexo.extend.tag.register('frame', function(args) {
-  args = args.join(' ').split(' | ');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(' | ');
+  }
   // 所有支持的参数
   const device = args[0].trim();
   let img = '';

package/scripts/tags/friends.js

@@ -0,0 +1,99 @@
+/**
+ * friends.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
+ *
+ * {% friends [only:group1] [not:group2] %}
+ */
+
+'use strict';
+
+hexo.extend.tag.register('friends', function(args) {
+  args = hexo.args.map(args, ['only', 'not', 'repo', 'api']);
+  if (args.only) {
+    if(/::/g.test(args.only)){
+      args.only = args.only.split('::');
+    }else{
+      args.only = args.only.split(',');
+    }
+  }
+  if (args.not) {
+    if(/::/g.test(args.not)){
+      args.not = args.not.split('::');
+    }else{
+      args.not = args.not.split(',');
+    }
+  }
+  var friends = hexo.locals.get('data').friends;
+  if (friends == undefined) {
+    friends = {};
+  }
+  if (args.repo) {
+    friends = {
+      group: {
+        api: args.api,
+        repo: args.repo
+      }
+    }
+  }
+  var el = '<div class="tag-plugin users-wrap">';
+  function groupHeader(group) {
+    var header = '<div class="group-header">';
+    if (group.title) {
+      header += hexo.render.renderSync({text: group.title, engine: 'markdown'}).split('\n').join('');
+    }
+    if (group.description) {
+      header += hexo.render.renderSync({text: group.description, engine: 'markdown'}).split('\n').join('');
+    }
+    header += '</div>';
+    return header;
+  }
+  function cell(friend) {
+    if (friend.url && friend.title) {
+      var cell = '<div class="user-card">';
+      cell += '<a class="card-link" target="_blank" rel="external noopener noreferrer" href="' + friend.url + '">';
+      cell += '<img src="' + (friend.avatar || hexo.theme.config.default.avatar) + '" onerror="errorImgAvatar(this)"/>';
+      cell += '<div class="name"><span>' + friend.title + '</span></div>';
+      cell += '</a></div>'
+      return cell;
+    } else {
+      return '';
+    }
+  }
+  for (let groupId of Object.keys(friends)) {
+    function f() {
+      if (args.not && args.not.includes(groupId)) {
+        return;
+      }
+      if (groupId in friends) {
+        let group = friends[groupId];
+        if (group.title || group.description) {
+          el += groupHeader(group);
+        }
+        if (group.repo) {
+          el += '<div class="friendsjs-wrap"';
+          el += ' id="friends-api"';
+          el += ' api="' + (group.api || 'https://issues-api.vercel.app') + '/v1/' + group.repo + '"';
+          el += '>';
+          el += '<div class="loading-wrap"><svg class="loading" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2709"><path d="M832 512c0-176-144-320-320-320V128c211.2 0 384 172.8 384 384h-64zM192 512c0 176 144 320 320 320v64C300.8 896 128 723.2 128 512h64z" p-id="2710"></path></svg><p></p></div>';
+          el += '<div class="group-body"></div>';
+          el += '</div>';
+        } else if (group.items) {
+          el += '<div class="group-body">';
+          group.items.forEach((friend, i) => {
+            el += cell(friend);
+          });
+          el += '</div>';
+        }
+      }
+    }
+    if (args.only) {
+      if (args.only.includes(groupId)) {
+        f();
+      }
+    } else {
+      f();
+    }
+  }
+  el += '</div>';
+  return el;
+});

package/scripts/tags/ghcard.js

@@ -7,7 +7,12 @@
 // {% ghcard volantis-x %}
 // {% ghcard volantis-x/hexo-theme-volantis %}
 hexo.extend.tag.register('ghcard', function(args) {
-  args = args.join(' ').split(', ');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   const path = args[0].trim();
   let card = '';
   card += '<a class="ghcard" rel="external nofollow noopener noreferrer" href="https://github.com/' + path + '">';

package/scripts/tags/image.js

@@ -12,7 +12,12 @@
 // {% image url, alt=haha, width=400px %}
 // {% image url, alt=haha, width=400px, bg=#eee %}
 hexo.extend.tag.register('image', function(args) {
-  args = args.join(' ').split(', ');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   const url = args[0].trim();
   let alt = '';
   let bg = '';
@@ -36,6 +41,8 @@ hexo.extend.tag.register('image', function(args) {
     img += '<img class="img" src="' + url + '"';
     if (alt.length > 0) {
       img += ' alt="' + alt + '"';
+    } else {
+      img += ' alt="image"';
     }
     if (style.length > 0) {
       img += ' style="' + style + '"';
@@ -68,7 +75,12 @@ hexo.extend.tag.register('image', function(args) {
 // {% inlineimage url %}
 // {% inlineimage url, height=22px %}
 hexo.extend.tag.register('inlineimage', function(args) {
-  args = args.join(' ').split(', ');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   const url = args[0].trim();
   let ret = '';
   ret += '<img no-lazy class="inline" src="' + url + '"';

package/scripts/tags/link.js

@@ -3,7 +3,12 @@
 // {% link title, url %}
 // {% link title, url, img %}
 hexo.extend.tag.register('link', function(args) {
-  args = args.join(' ').split(',');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   let text = '';
   let url = '';
   let img = '';

package/scripts/tags/md.js

@@ -0,0 +1,59 @@
+
+hexo.extend.tag.register('md', function(args) {
+  const {config} = hexo;
+  const md_path = args[0].trim();
+  let md_id = "md-" + hexo.createUuid()
+  let mat = `
+  <div id="${md_id}" class="tag-md markdown-body"></div>
+  <script>
+  (()=>{
+    volantis.css("${hexo.theme.config.plugins.markdown}");
+    const contentEl = document.getElementById("${md_id}");
+    const loadMarkdown = (url) => {
+      if (!window.fetch) {
+        contentEl.innerHTML =
+          '<div style="font-size: 24px"><p>Your browser outdated. Please use the latest version of Chrome or Firefox!</p><p>您的浏览器版本过低，请使用最新版的 Chrome 或 Firefox 浏览器！</p></div>';
+      } else {
+        contentEl.innerHTML =
+          '<div style="font-size: 24px">Loading ... | 加载中。。。</div>';
+        fetch(url, { method: "GET" })
+          .then((resp) => {
+            return Promise.all([
+              resp.ok,
+              resp.status,
+              resp.text(),
+              resp.headers,
+            ]);
+          })
+          .then(([ok, status, data, headers]) => {
+            if (ok) {
+              return {
+                ok,
+                status,
+                data,
+                headers,
+              };
+            } else {
+              throw new Error(JSON.stringify(json.error));
+            }
+          })
+          .then((resp) => {
+            let data = marked.parse(resp.data);
+            contentEl.innerHTML = data;
+          })
+          .catch((error) => {
+            console.log(error);
+            contentEl.innerHTML =
+              '<div style="font-size: 24px"><p>There was a problem loading the file!</p><p>加载文件时出现问题！</p></div>';
+          });
+      };
+    };
+    volantis.js("${hexo.theme.config.plugins.marked}").then(()=>{
+      loadMarkdown("${md_path}?t=" + new Date().getTime());
+    })
+  })();
+  </script>
+  `
+
+  return mat
+});

package/scripts/tags/media.js

@@ -6,12 +6,36 @@ function postAudio(args) {
 }
 
 function postVideo(args) {
+  const {config} = hexo;
   const src = args[0].trim();
+  // m3u8 https://github.com/volantis-x/hexo-theme-volantis/issues/606
+  // 文件扩展名为 .m3u8
+  if (hexo.getType(src) === "m3u8") {
+    let video_id = `video-${hexo.createUuid()}`
+    return `<div clsss="video"><video id="${video_id}" controls loop="false" width="100%"></video></div>
+        <script>
+          volantis.js("${hexo.theme.config.plugins.hlsjs}").then(()=>{
+            var video = document.getElementById('${video_id}');
+            if(Hls.isSupported()) {
+              var hls = new Hls();
+              hls.loadSource('${src}');
+              hls.attachMedia(video);
+            }else if (video.canPlayType('application/vnd.apple.mpegurl')) {
+              video.src = '${src}';
+            }
+          })
+        </script>`;
+  }
   return `<div class="video"><video controls preload><source src='${src}' type='video/mp4'>Your browser does not support the video tag.</video></div>`;
 }
 
 function postVideos(args, content) {
-  args = args.join(' ').split(',');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   var cls = args[0];
   if (cls.length > 0) {
     cls = ' ' + cls;

package/scripts/tags/note.js

@@ -6,7 +6,12 @@
 
 // {% note style, content %}
 function postNote(args) {
-  args = args.join(' ').split(', ');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   if (args.length > 1) {
     const cls = args[0].trim();
     const text = args[1].trim();
@@ -21,7 +26,12 @@ function postNote(args) {
 // content
 // {% endnoteblock %}
 function postNoteBlock(args, content) {
-  args = args.join(' ').split(', ');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   if (args.length < 1) {
     return;
   }
@@ -38,4 +48,27 @@ function postNoteBlock(args, content) {
 }
 
 hexo.extend.tag.register('note', postNote);
-hexo.extend.tag.register('noteblock', postNoteBlock, {ends: true});
+
+// https://github.com/volantis-x/hexo-theme-volantis/issues/712
+// {% blocknote style, title %}
+// content
+// {% endblocknote %}
+hexo.extend.tag.register('blocknote', postNoteBlock, {ends: true});
+// 兼容 noteblock
+hexo.extend.filter.register('before_post_render', function(data) {
+  data.content = data.content.replace(/{%\s+noteblock(.*)%}/g, (p,q)=>{
+    return `{% blocknote ${q} %}`
+  });
+  data.content = data.content.replace(/{%\s+endnoteblock\s+%}/g, '{% endblocknote %}');
+  return data;
+});
+// 兼容 noteblock 失败
+hexo.extend.tag.register('noteblock', postNoteBlockDeprecated, {ends: true});
+function postNoteBlockDeprecated(args, content) {
+    throw new Error(`
+==================================================================================
+        {% noteblock %} is deprecated. Use {% blocknote %} instead.
+        see: https://github.com/volantis-x/hexo-theme-volantis/issues/712
+==================================================================================
+  `);
+}

package/scripts/tags/site.js

@@ -1,59 +1,95 @@
+/**
+ * sites.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
+ *
+ * {% sites [only:group1] [not:group2] %}
+ */
+
 'use strict';
 
-function postSiteCardGroup(args, content) {
-  if (args.length > 0) {
-    return `<div class="site-card-group"><p class='p h2'>${args}</p>${content}</div>`;
+hexo.extend.tag.register('sites', function(args) {
+  args = hexo.args.map(args, ['only', 'not', 'repo', 'api']);
+  if (args.only) {
+    args.only = args.only.split(',');
   }
-  return `<div class="site-card-group">${content}</div>`;
-
-}
-function postSiteCard(args) {
-  args = args.join(' ').split(', ');
-  // 所有支持的参数
-  const title = args[0].trim();
-  let url = '';
-  let screenshot = '';
-  let avatar = '';
-  let description = '';
-  // 解析
-  if (args.length > 1) {
-    for (let i = 1; i < args.length; i++) {
-      const tmp = args[i].trim();
-      if (tmp.includes('url=')) {
-        url = tmp.substring(4, tmp.length);
-      } else if (tmp.includes('screenshot=')) {
-        screenshot = tmp.substring(11, tmp.length);
-      } else if (tmp.includes('avatar=')) {
-        avatar = tmp.substring(7, tmp.length);
-      } else if (tmp.includes('description=')) {
-        description = tmp.substring(12, tmp.length);
+  if (args.not) {
+    args.not = args.not.split(',');
+  }
+  var sites = hexo.locals.get('data').sites;
+  if (sites == undefined) {
+    sites = {};
+  }
+  if (args.repo) {
+    sites = {
+      group: {
+        api: args.api,
+        repo: args.repo
       }
     }
   }
-  // 布局
-  let result = '';
-  result += '<a class="site-card" href="' + url + '">';
-  result += '<div class="img"><img src="' + screenshot + '"/></div>';
-  result += '<div class="info">';
-  if (avatar.length > 0) {
-    result += '<img src="' + avatar + '"/>';
-  } else {
-
+  var el = '<div class="tag-plugin sites-wrap">';
+  function groupHeader(group) {
+    var header = '<div class="group-header">';
+    if (group.title) {
+      header += hexo.render.renderSync({text: group.title, engine: 'markdown'}).split('\n').join('');
+    }
+    if (group.description) {
+      header += hexo.render.renderSync({text: group.description, engine: 'markdown'}).split('\n').join('');
+    }
+    header += '</div>';
+    return header;
   }
-
-  result += '<span class="title">' + title + '</span>';
-  if (description.length > 0) {
-    result += '<span class="desc">' + description + '</span>';
-  } else {
-
+  function cell(site) {
+    if (site.url && site.title) {
+      var cell = '<div class="site-card">';
+      cell += '<a class="card-link" target="_blank" rel="external noopener noreferrer" href="' + site.url + '">';
+      cell += '<img src="' + (site.screenshot || ('https://image.thum.io/get/width/1024/crop/768/' + site.url)) + '" onerror="errorImgCover(this)"/>';
+      cell += '<div class="info">';
+      cell += '<img src="' + (site.avatar || hexo.theme.config.default.link) + '" onerror="errorImgAvatar(this)"/>';
+      cell += '<span class="title">' + site.title + '</span>';
+      cell += '<span class="desc">' + (site.description || site.url) + '</span>';
+      cell += '</div>';
+      cell += '</a></div>'
+      return cell;
+    } else {
+      return '';
+    }
   }
-
-  result += '</div></a>';
-  return result;
-
-}
-
-// {% site link, img, title %}
-// {% site link, img, title, description %}
-hexo.extend.tag.register('site', postSiteCard);
-hexo.extend.tag.register('sitegroup', postSiteCardGroup, {ends: true});
+  for (let groupId of Object.keys(sites)) {
+    function f() {
+      if (args.not && args.not.includes(groupId)) {
+        return;
+      }
+      if (groupId in sites) {
+        let group = sites[groupId];
+        if (group.title || group.description) {
+          el += groupHeader(group);
+        }
+        if (group.repo) {
+          el += '<div class="sitesjs-wrap"';
+          el += ' id="sites-api"';
+          el += ' api="' + (group.api || 'https://issues-api.vercel.app') + '/v1/' + group.repo + '"';
+          el += '>';
+          el += '<div class="loading-wrap"><svg class="loading" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2709"><path d="M832 512c0-176-144-320-320-320V128c211.2 0 384 172.8 384 384h-64zM192 512c0 176 144 320 320 320v64C300.8 896 128 723.2 128 512h64z" p-id="2710"></path></svg><p></p></div>';
+          el += '<div class="group-body"></div>';
+          el += '</div>';
+        } else if (group.items) {
+          el += '<div class="group-body">';
+          group.items.forEach((site, i) => {
+            el += cell(site);
+          });
+          el += '</div>';
+        }
+      }
+    }
+    if (args.only) {
+      if (args.only.includes(groupId)) {
+        f();
+      }
+    } else {
+      f();
+    }
+  }
+  el += '</div>';
+  return el;
+});

package/scripts/tags/span.js

@@ -1,13 +1,23 @@
 'use strict';
 
 function postP(args) {
-  args = args.join(' ').split(',');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   const p0 = args[0].trim();
   const p1 = args[1].trim();
   return `<p class='p ${p0}'>${p1}</p>`;
 }
 function postSpan(args) {
-  args = args.join(' ').split(',');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   const p0 = args[0].trim();
   const p1 = args[1].trim();
   return `<span class='p ${p0}'>${p1}</span>`;