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

package/scripts/tags/link.js

@@ -3,19 +3,24 @@
 // {% link title, url %}
 // {% link title, url, img %}
 hexo.extend.tag.register('link', function(args) {
-  args = args.join(' ').split(',')
-  let text = ''
-  let url = ''
-  let img = ''
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
+  let text = '';
+  let url = '';
+  let img = '';
   if (args.length < 2) {
-    return
+    return;
   } else if (args.length == 2) {
-    text = args[0].trim()
-    url = args[1].trim()
+    text = args[0].trim();
+    url = args[1].trim();
   } else if (args.length == 3) {
-    text = args[0].trim()
-    url = args[1].trim()
-    img = args[2].trim()
+    text = args[0].trim();
+    url = args[1].trim();
+    img = args[2].trim();
   }
   let result = '';
   // 发现如果不套一层 div 在其它可渲染 md 的容器中容易被分解

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

@@ -1,27 +1,51 @@
 'use strict';
 
 function postAudio(args) {
-  let src = args[0].trim()
+  const src = args[0].trim();
   return `<div class="audio"><audio controls preload><source src='${src}' type='audio/mp3'>Your browser does not support the audio tag.</audio></div>`;
 }
 
 function postVideo(args) {
-  let src = args[0].trim()
+  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(',')
-  var cls = args[0]
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
+  var cls = args[0];
   if (cls.length > 0) {
-    cls = ' ' + cls
+    cls = ' ' + cls;
   }
   var col = Number(args[1]) || 0;
   if (col > 0) {
-    return `<div class="videos${cls}" col='${col}'>${content}</div>`
-  } else {
-    return `<div class="videos${cls}">${content}</div>`
+    return `<div class="videos${cls}" col='${col}'>${content}</div>`;
   }
+  return `<div class="videos${cls}">${content}</div>`;
+
 }
 
 hexo.extend.tag.register('audio', postAudio);

package/scripts/tags/note.js

@@ -6,13 +6,18 @@
 
 // {% 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) {
-    let cls = args[0].trim()
-    let text = args[1].trim()
+    const cls = args[0].trim();
+    const text = args[1].trim();
     return `<div class="note ${cls}">${hexo.render.renderSync({text: text, engine: 'markdown'}).split('\n').join('')}</div>`;
   } else if (args.length > 0) {
-    let text = args[0].trim()
+    const text = args[0].trim();
     return `<div class="note">${hexo.render.renderSync({text: text, engine: 'markdown'}).split('\n').join('')}</div>`;
   }
 }
@@ -21,15 +26,20 @@ 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;
   }
-  let cls = args[0].trim();
+  const cls = args[0].trim();
   let ret = '';
   ret += '<div class="note ' + cls + '">';
   if (args.length > 1) {
-    let title = args[1].trim();
+    const title = args[1].trim();
     ret += '<p><strong>' + title + '</strong></p>';
   }
   ret += hexo.render.renderSync({text: content, engine: 'markdown'}).split('\n').join('');
@@ -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>`;
-  } else {
-    return `<div class="site-card-group">${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(',');
+  }
+  if (args.not) {
+    args.not = args.not.split(',');
+  }
+  var sites = hexo.locals.get('data').sites;
+  if (sites == undefined) {
+    sites = {};
   }
-}
-function postSiteCard(args) {
-  args = args.join(' ').split(', ')
-  // 所有支持的参数
-  let title = args[0].trim();
-  let url = '';
-  let screenshot = '';
-  let avatar = '';
-  let description = '';
-  // 解析
-  if (args.length > 1) {
-    for (let i = 1; i < args.length; i++) {
-      let 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.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,15 +1,25 @@
 'use strict';
 
 function postP(args) {
-  args = args.join(' ').split(',')
-  let p0 = args[0].trim()
-  let p1 = args[1].trim()
+  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(',')
-  let p0 = args[0].trim()
-  let p1 = args[1].trim()
+  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>`;
 }
 

package/scripts/tags/swiper.js

@@ -0,0 +1,38 @@
+/**
+ * swiper.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
+ *
+ * {% swiper %}
+ * ![img](src)
+ * {% endswiper %}
+ */
+
+'use strict';
+
+hexo.extend.tag.register('swiper', function (args, content) {
+  args = hexo.args.map(args, ['width']);
+  var el = '';
+  function slide() {
+    let imgs = hexo.render.renderSync({ text: content, engine: 'markdown' });
+    imgs = imgs.match(/<img(.*?)src="(.*?)"(.*?)>/gi);
+    if (imgs && imgs.length > 0) {
+      imgs.forEach((img, i) => {
+        img = img.replace('<img src', '<img no-lazy src');
+        el += '<div class="swiper-slide">' + img + '</div>';
+      });
+    }
+  }
+  el += '<div class="tag-plugin swiper-container"';
+  if (args.width && args.width.length > 0) {
+    el += ' ' + hexo.args.joinTags(args, 'width').join(' ');
+  }
+  el += '>';
+  el += '<div class="swiper-wrapper">';
+  slide();
+  el += '</div>';
+  el += '<div class="swiper-pagination"></div>';
+  el += '<div class="swiper-button-prev blur"></div>';
+  el += '<div class="swiper-button-next blur"></div>';
+  el += '</div>';
+  return el;
+}, { ends: true });

package/scripts/tags/table.js

@@ -14,6 +14,6 @@ function postTable(args, content) {
   ret += hexo.render.renderSync({text: content, engine: 'markdown'});
   ret += '</div>';
   return ret;
-};
+}
 
 hexo.extend.tag.register('table', postTable, {ends: true});

package/scripts/tags/tabs.js

@@ -7,7 +7,12 @@
 function postTabs(args, content) {
   var tabBlock = /<!--\s*tab (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtab\s*-->/g;
 
-  args = args.join(' ').split(',');
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
   var tabName = args[0];
   var tabActive = Number(args[1]) || 0;
 
@@ -31,8 +36,33 @@ function postTabs(args, content) {
     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('-');
 
@@ -50,8 +80,8 @@ function postTabs(args, content) {
 
   tabNav = `<ul class="nav-tabs">${tabNav}</ul>`;
   tabContent = `<div class="tab-content">${tabContent}</div>`;
-
-  return `<div class="tabs" id="${tabName.toLowerCase().split(' ').join('-')}">${tabNav + 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});

package/scripts/tags/timeline.js

@@ -7,14 +7,19 @@
 function postTimeline(args, content) {
   if (args.length > 0) {
     return `<div class="timeline"><p class='p h2'>${args}</p>${content}</div>`;
-  } else {
-    return `<div class="timeline">${content}</div>`;
   }
+  return `<div class="timeline">${content}</div>`;
+
 }
 
 function postTimenode(args, content) {
-  args = args.join(' ').split(',')
-  var time = args[0]
+  if(/::/g.test(args)){
+    args = args.join(' ').split('::');
+  }
+  else{
+    args = args.join(' ').split(',');
+  }
+  var time = args[0];
   return `<div class="timenode"><div class="meta"><p>${hexo.render.renderSync({text: time, engine: 'markdown'})}</p></div><div class="body">${hexo.render.renderSync({text: content, engine: 'markdown'}).split('\n').join('')}</div></div>`;
 }
 

package/source/css/Readme.md

@@ -0,0 +1,28 @@
+# 样式文件说明
+
+## 样式拆分说明
+
+方案是对 https://blog.skk.moe/post/improve-fcp-for-my-blog/ 的开源实现
+
+### first.styl
+
+首屏样式, 内含 首屏基础样式、 cover、 navbar、 首屏search、首屏暗黑模式、首屏字体 等样式, 首屏样式采用硬编码的方式写在HTML中.
+
+内联硬编码自动化方案 see：scripts/helpers/first-style/index.js
+
+### style.styl
+
+异步加载样式, 除首屏样式外的其他样式, 最终生成 /css/style.css 异步加载.
+
+## 暗黑模式样式说明
+
+暗黑模式样式被拆分为首屏暗黑模式样式和异步暗黑模式样式，其中在 source/css/ 文件夹下：
+
+_first/dark_first.styl ： 包含 首屏暗黑模式样式 的 暗黑模式 CSS 变量 和 强制覆盖样式
+
+_style/_plugins/_dark ： 异步暗黑模式样式文件夹
+
+_style/_plugins/_dark/dark_async.styl ： 包含 异步暗黑模式样式 的 暗黑模式 CSS 变量
+
+_style/_plugins/_dark/dark_plugins.styl ： 包含 异步暗黑模式样式 的 强制覆盖样式
+