🐛 fix: 修復當menu沒設置圖標時,會報Cannot read property 'trim' of undefined 的bug

🐛 fix: 修復meta description 自動生成文章前200文字時部分沒有轉義的bug
This commit is contained in:
Jerry
2020-04-27 02:37:20 +08:00
parent 6cf59387c8
commit 92111f3c32
2 changed files with 9 additions and 6 deletions

View File

@@ -3,11 +3,13 @@
if !Array.isArray(value) if !Array.isArray(value)
.menus_item .menus_item
a.site-page(href=url_for(trim(value.split('||')[0]))) a.site-page(href=url_for(trim(value.split('||')[0])))
if value.split('||')[1]
i.fa-fw(class=trim(value.split('||')[1])) i.fa-fw(class=trim(value.split('||')[1]))
span=' '+label span=' '+label
else else
.menus_item .menus_item
a.site-page a.site-page
if label.split('||')[1]
i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true") i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true")
span=' '+ trim(label.split('||')[0]) span=' '+ trim(label.split('||')[0])
i.fa.fa-chevron-down.menus-expand(aria-hidden="true") i.fa.fa-chevron-down.menus-expand(aria-hidden="true")
@@ -15,5 +17,6 @@
each i in value each i in value
li li
a.site-page(href=url_for(trim(i.split('||')[1]))) a.site-page(href=url_for(trim(i.split('||')[1])))
if i.split('||')[2]
i.fa-fw(class=trim(i.split('||')[2])) i.fa-fw(class=trim(i.split('||')[2]))
span=' '+trim(i.split('||')[0]) span=' '+trim(i.split('||')[0])

View File

@@ -8,16 +8,16 @@
'use strict' 'use strict'
const { stripHTML } = require('hexo-util') const { stripHTML, escapeHTML } = require('hexo-util')
hexo.extend.helper.register('page_description', function () { hexo.extend.helper.register('page_description', function () {
const { config, page } = this const { config, page } = this
let description = page.description || page.content || page.title || config.description let description = page.description || page.content || page.title || config.description
if (description) { if (description) {
description = stripHTML(description).substring(0, 200) description = escapeHTML(stripHTML(description).substring(0, 200)
.trim() .trim()
.replace(/\n/g, ' ') ).replace(/\n/g, ' ')
return description return description
} }
}) })