🔖 2.2.5發佈

更新内容請看 https://github.com/jerryc127/hexo-theme-butterfly/releases

layout/includes/additional-js.pug

@@ -62,4 +62,4 @@ if theme.mermaid.enable
   include ./math/mermaid.pug
 
 if is_home()
-  include index-js.pug
+  include ./head/subtitle.pug

layout/includes/head.pug

@@ -1,16 +1,19 @@
-- var pageTitle = page.title || config.title || ''
+- var pageTitle
 - if (is_archive()) pageTitle = _p('page.archives')
-- if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
-- if (is_category()) pageTitle = _p('page.category') + ': ' + page.category
-- if (is_month()) pageTitle += ': ' + page.month + '/' + page.year
-- if (is_year()) pageTitle += ': ' + page.year
+- else if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
+- else if (is_category()) pageTitle = _p('page.category') + ': ' + page.category
+- else if (is_month()) pageTitle += ': ' + page.month + '/' + page.year
+- else if (is_year()) pageTitle += ': ' + page.year
+- else if (is_current('/404.html', [strict])) pageTitle = _p('error_title')
+- else pageTitle = page.title || config.title || ''
+
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
 - var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
-- pageTitle ? '' : pageTitle = config.title || ''
 
 - var pageDescription = page.description || page.title || config.description
-- var pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
+- var pageKeywords
 - if (page.tags && page.tags.data) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
+- else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
 - var without_html = url.replace('index.html', '')
@@ -97,4 +100,6 @@ if theme.blog_title_font.font_link
 
 //- global config
 !=partial('includes/head/config', {}, {cache:theme.fragment_cache})
+
 include ./head/config_site.pug
+include ./head/noscript.pug

layout/includes/head/config.pug

@@ -42,7 +42,7 @@
     copyright = JSON.stringify({      
       languages: {
       author: _p("copy_copyright.author") + ': ' + config.author,
-      link: _p("copy_copyright.link") + ': ' + without_html,
+      link: _p("copy_copyright.link") + ': ',
       source: _p("copy_copyright.source") + ': ' + config.title,
       info: _p("copy_copyright.info")
       }
@@ -62,7 +62,6 @@
   if (theme.snackbar && theme.snackbar.enable) {
   Snackbar = JSON.stringify({      
     bookmark: {
-      title: _p("Snackbar.bookmark.title"),
       message_prev: _p("Snackbar.bookmark.message_prev"),
       message_next: _p("Snackbar.bookmark.message_next")
     },
@@ -76,16 +75,6 @@
     })
   }
 
-  var highlightCopy = theme.highlight_copy
-  var highlightLang = theme.highlight_lang
-  var highlightShrink  = theme.highlight_shrink
-  var runtime = theme.runtimeshow.enable
-  var fancybox = theme.fancybox.enable
-  var medium_zoom = theme.medium_zoom.enable
-  var baiduPush = theme.baidu_push && theme.baidu_push.enable
-  var isFontAwesomeV5 = theme.fontawesome_v5 && theme.fontawesome_v5.enable
-
-
 script.
   var GLOBAL_CONFIG = { 
     root: '!{config.root}',
@@ -98,22 +87,22 @@ script.
       noSupport: '!{_p("copy.noSupport")}'
     },
     bookmark: {
-      title: '!{_p("Snackbar.bookmark.title")}',
       message_prev: '!{_p("Snackbar.bookmark.message_prev")}',
       message_next: '!{_p("Snackbar.bookmark.message_next")}'
     },
     runtime_unit: '!{_p("runtime_unit")}',
-    runtime: !{runtime},
+    runtime: !{theme.runtimeshow.enable},
     copyright: !{copyright},
     ClickShowText: !{ClickShowText},
-    medium_zoom: !{medium_zoom},
-    fancybox: !{fancybox},
+    medium_zoom: !{theme.medium_zoom.enable},
+    fancybox: !{theme.fancybox.enable},
     Snackbar: !{Snackbar},
-    baiduPush: !{baiduPush},
-    highlightCopy: !{highlightCopy},
-    highlightLang: !{highlightLang},
-    highlightShrink: !{highlightShrink},
-    isFontAwesomeV5: !{isFontAwesomeV5}
+    baiduPush: !{theme.baidu_push && theme.baidu_push.enable},
+    highlightCopy: !{theme.highlight_copy},
+    highlightLang: !{theme.highlight_lang},
+    highlightShrink: '!{theme.highlight_shrink}',
+    isFontAwesomeV5: !{theme.fontawesome_v5 && theme.fontawesome_v5.enable},
+    isPhotoFigcaption: !{theme.photofigcaption}
     
   }