diff --git a/layout/includes/header/menu_item.pug b/layout/includes/header/menu_item.pug index 81c6f6c..983bcec 100644 --- a/layout/includes/header/menu_item.pug +++ b/layout/includes/header/menu_item.pug @@ -3,17 +3,20 @@ if !Array.isArray(value) .menus_item a.site-page(href=url_for(trim(value.split('||')[0]))) - i.fa-fw(class=trim(value.split('||')[1])) + if value.split('||')[1] + i.fa-fw(class=trim(value.split('||')[1])) span=' '+label else .menus_item a.site-page - i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true") + if label.split('||')[1] + i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true") span=' '+ trim(label.split('||')[0]) i.fa.fa-chevron-down.menus-expand(aria-hidden="true") ul.menus_item_child each i in value li a.site-page(href=url_for(trim(i.split('||')[1]))) - i.fa-fw(class=trim(i.split('||')[2])) + if i.split('||')[2] + i.fa-fw(class=trim(i.split('||')[2])) span=' '+trim(i.split('||')[0]) \ No newline at end of file diff --git a/scripts/helpers/page.js b/scripts/helpers/page.js index c6360d5..d877e28 100644 --- a/scripts/helpers/page.js +++ b/scripts/helpers/page.js @@ -8,16 +8,16 @@ 'use strict' -const { stripHTML } = require('hexo-util') +const { stripHTML, escapeHTML } = require('hexo-util') hexo.extend.helper.register('page_description', function () { const { config, page } = this let description = page.description || page.content || page.title || config.description if (description) { - description = stripHTML(description).substring(0, 200) + description = escapeHTML(stripHTML(description).substring(0, 200) .trim() - .replace(/\n/g, ' ') + ).replace(/\n/g, ' ') return description } })