🏷️ 更新至3.0.0-RC-1 close #189, close #192, close #223, close #224, close #229, close 232, close #240

scripts/filters/post_lazyload.js

@@ -3,18 +3,19 @@
  * lazyload
  * replace src to data-src
  */
+// <figure .+class="[^"]* highlight [^"]*".+>
 
 'use strict'
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
 function lazyProcess (htmlContent) {
-  var bg = hexo.theme.config.lodding_bg.post ? urlFor(hexo.theme.config.lodding_bg.post) : 'data:image/gif;base64,R0lGODdhAQABAPAAAMPDwwAAACwAAAAAAQABAAACAkQBADs='
-  return htmlContent.replace(/(<img .*?src=)/ig, `$1 ${bg} data-src=`)
+  var bg = hexo.theme.config.lazyload.post ? urlFor(hexo.theme.config.lazyload.post) : 'data:image/gif;base64,R0lGODdhAQABAPAAAMPDwwAAACwAAAAAAQABAAACAkQBADs='
+  return htmlContent.replace(/(<img .*?src=)/ig, `$1 "${bg}" data-src=`)
 }
 
 var processPost = function (data) {
-  if (!hexo.theme.config.lazyload) return
+  if (!hexo.theme.config.lazyload.enable) return
   data.content = lazyProcess.call(this, data.content)
   return data
 }

scripts/helpers/aside_archives.js

@@ -92,7 +92,7 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
   if (len > Judge) {
     result += '<li class="card-archive-list-item more is-center">'
     result += `<a class="card-archive-list-link-more" href="${this.url_for(archiveDir)}">
-              <span>${moreButton}</span><i class="fa fa-angle-right" aria-hidden="true"></i></a></li>`
+              <span>${moreButton}</span><i class="fas fa-angle-right"  ></i></a></li>`
   }
   result += '</ul>'
   return result

scripts/helpers/aside_categories.js

@@ -6,9 +6,7 @@
 'use strict'
 
 hexo.extend.helper.register('aside_categories', function (categories, options) {
-  if (
-    !options &&
-    (!categories || !Object.prototype.hasOwnProperty.call(categories, 'length'))
+  if (!options && (!categories || !Object.prototype.hasOwnProperty.call(categories, 'length'))
   ) {
     options = categories
     categories = this.site.categories
@@ -25,47 +23,48 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
   const order = options.order || 1
   const categoryDir = this.url_for(config.category_dir)
   const limit = options.limit === 0 ? categories.length : options.limit
+  const isExpand = options.expand !== 'none'
+  const expandClass = isExpand && options.expand === true ? 'card-category-list-icon expand' : 'card-category-list-icon'
+
   const buttonLabel = this._p('aside.more_button')
   const prepareQuery = (parent) => {
     const query = {}
-    if (parent) {
-      query.parent = parent
-    } else {
-      query.parent = {
-        $exists: false,
-      }
-    }
-    return categories
-      .find(query)
-      .sort(orderby, order)
-      .filter((cat) => cat.length)
+    if (parent) { query.parent = parent } else { query.parent = { $exists: false } }
+    return categories.find(query).sort(orderby, order).filter((cat) => cat.length)
   }
 
-  const hierarchicalList = (t, level, parent) => {
+  const hierarchicalList = (t, level, parent, topparent = true) => {
     let result = ''
+    var isTopParent = topparent
     if (t > 0) {
       prepareQuery(parent).forEach((cat, i) => {
         if (t > 0) {
           t = t - 1
           let child
           if (!depth || level + 1 < depth) {
-            var childList = hierarchicalList(t, level + 1, cat._id)
+            var childList = hierarchicalList(t, level + 1, cat._id, false)
             child = childList[0]
             t = childList[1]
           }
 
-          result += '<li class="card-category-list-item">'
+          var parentClass = isExpand && isTopParent && child ? 'parent' : ''
+
+          result += `<li class="card-category-list-item ${parentClass}">`
+
+          result += `<a class="card-category-list-link" href="${this.url_for(cat.path)}">`
 
-          result += `<a class="card-category-list-link" href="${this.url_for(
-            cat.path
-          )}">`
           result += `<span class="card-category-list-name">${cat.name}</span>`
 
           if (showCount) {
             result += `<span class="card-category-list-count">${cat.length}</span>`
           }
 
+          if (isExpand && isTopParent && child) {
+            result += `<i class="fas fa-caret-left ${expandClass}"></i>`
+          }
+
           result += '</a>'
+
           result += '</li>'
 
           if (child) {
@@ -85,7 +84,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
     if (categories.length <= limit) return ''
     moreHtml += '<li class="card-category-list-item more is-center">'
     moreHtml += `<a class="card-category-list-link-more" href="${categoryDir}">
-                <span>${buttonLabel}</span><i class="fa fa-angle-right" aria-hidden="true"></i></a></li>`
+                <span>${buttonLabel}</span><i class="fas fa-angle-right"></i></a></li>`
 
     return moreHtml
   }

scripts/helpers/related_post.js

@@ -41,14 +41,14 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
   var limitNum = config.related_post.limit || 6
   var dateType = config.related_post.date_type || 'created'
   var headlineLang = this._p('post.recommend')
-  var lazySrc = config.lazyload ? 'data-src' : 'src'
+  var lazySrc = config.lazyload.enable ? 'data-src' : 'src'
 
   relatedPosts = relatedPosts.sort(compare('weight'))
 
   if (relatedPosts.length > 0) {
     result += '<div class="relatedPosts">'
     result +=
-      '<div class="relatedPosts_headline"><i class="fa fa-fw fa-thumbs-up" aria-hidden="true"></i><span>' +
+      '<div class="relatedPosts_headline"><i class="fas fa-thumbs-up fa-fw"></i><span>' +
       ' ' +
       headlineLang +
       '</span></div>'
@@ -74,13 +74,13 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
         '">'
       if (dateType === 'created') {
         result +=
-          '<div class="relatedPosts_main is-center"><div class="relatedPosts_date"><i class="fa fa-calendar fa-fw" aria-hidden="true"></i>' +
+          '<div class="relatedPosts_main is-center"><div class="relatedPosts_date"><i class="far fa-calendar-alt fa-fw"></i>' +
           ' ' +
           this.date(relatedPosts[i].created, hexoConfig.date_format) +
           '</div>'
       } else {
         result +=
-          '<div class="relatedPosts_main is-center"><div class="relatedPosts_date"><i class="fa fa-history fa-fw" aria-hidden="true"></i>' +
+          '<div class="relatedPosts_main is-center"><div class="relatedPosts_date"><i class="fas fa-history fa-fw"></i>' +
           ' ' +
           this.date(relatedPosts[i].updated, hexoConfig.date_format) +
           '</div>'
@@ -90,7 +90,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
       result += '</div></a></div>'
     }
 
-    result += '</div><div class="clear_both"></div></div>'
+    result += '</div></div>'
     return result
   }
 })

scripts/tags/button.js

@@ -0,0 +1,28 @@
+/**
+ * Button
+ * {% btn url text icon option %}
+ * option: color outline center block larger
+ * color : default/blue/pink/red/purple/orange/green
+ */
+
+'use strict'
+
+const urlFor = require('hexo-util').url_for.bind(hexo)
+
+function btn (args) {
+  args = args.join(' ').split(',')
+  var url = args[0] || ''
+  var text = args[1] || ''
+  var icon = args[2] || ''
+  var option = args[3] || ''
+
+  url = url.trim()
+  text = text.trim()
+  icon = icon.trim()
+  option = option.trim()
+
+  return `<a class="btn-beautify button--animated ${option}" href="${urlFor(url)}" title="${text}">
+  ${icon.length > 0 ? `<i class="${icon} fa-fw"></i>` : ''} ${text} </a>`
+}
+
+hexo.extend.tag.register('btn', btn, { ends: false })

scripts/tags/hide.js

@@ -28,8 +28,8 @@ function hideInline (args) {
   if (color) group += `color: ${color}`
   group += '"'
 
-  return `<span class="hide-inline"><a class="hide-button button--primary button--animated" ${group}>${display}
-  </a><span class="hide-content">${content}</span></span>`
+  return `<span class="hide-inline"><button class="hide-button button--animated" ${group}>${display}
+  </button><span class="hide-content">${content}</span></span>`
 }
 
 function hideBlock (args, content) {
@@ -43,8 +43,8 @@ function hideBlock (args, content) {
   if (color) group += `color: ${color}`
   group += '"'
 
-  return `<div class="hide-block"><a class="hide-button button--primary button--animated" ${group}>${display}
-    </a><span class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}</span></div>`
+  return `<div class="hide-block"><button class="hide-button button--animated" ${group}>${display}
+    </button><span class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}</span></div>`
 }
 
 function hideToggle (args, content) {
@@ -62,7 +62,7 @@ function hideToggle (args, content) {
   if (color) group += `color: ${color}`
   group += '"'
 
-  return `<div class="hide-toggle" ${border}><div class="hide-button toggle-title" ${group}><i class="fa fa-caret-right fa-fw"></i><span>${display}</span></div>
+  return `<div class="hide-toggle" ${border}><div class="hide-button toggle-title" ${group}><i class="fas fa-caret-right fa-fw"></i><span>${display}</span></div>
     <div class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}</div></div>`
 }
 

scripts/tags/tabs.js

@@ -0,0 +1,62 @@
+/**
+ * Tabs
+ * transplant from hexo-theme-next
+ * modify by Jerry
+ */
+
+'use strict'
+
+function postTabs (args, content) {
+  var tabBlock = /<!--\s*tab (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtab\s*-->/g
+
+  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 = ''
+
+    postContent = hexo.render.renderSync({ text: postContent, engine: 'markdown' }).trim()
+
+    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;"' : ''
+    var icon = tabIcon.trim()
+    tabIcon.length > 0 && (tabIcon = `<i class="${icon}"${isOnlyicon}></i>`)
+
+    var toTop = '<button class="tab-to-top" onclick="scrollToDest($(this).parents(\'.tabs\'),65)"><i class="fas fa-arrow-up"></i></button>'
+
+    var isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : ''
+    tabNav += `<li class="tab${isActive}"><a href="#${tabHref}">${tabIcon + tabCaption.trim()}</a></li>`
+    tabContent += `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent + toTop}</div>`
+  }
+
+  tabNav = `<ul class="nav-tabs">${tabNav}</ul>`
+  tabContent = `<div class="tab-contents">${tabContent}</div>`
+
+  return `<div class="tabs" id="${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 })