🔖 2.2.5發佈

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

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}
     
   }
 

layout/includes/head/config_site.pug

@@ -1,6 +1,7 @@
 script.
   var GLOBAL_CONFIG_SITE = { 
     isPost: !{is_post()},
-    isHome: !{is_home()}
-  }
+    isHome: !{is_home()},
+    isSidebar: !{is_post() && page.toc !== false && theme.toc.enable && (toc(page.content) !== '' || page.encrypt == true )}  
+    }
 

layout/includes/head/darkmode.pug

@@ -1,20 +1,20 @@
 script.
-  const autoChangeMode = '#{theme.darkmode.autoChangeMode}'
+  var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
   var t = Cookies.get("theme")
   if (autoChangeMode == '1'){
-    const isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches
-    const isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches
-    const isNotSpecified = window.matchMedia("(prefers-color-scheme: no-preference)").matches
-    const hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
+    var isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches
+    var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches
+    var isNotSpecified = window.matchMedia("(prefers-color-scheme: no-preference)").matches
+    var hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
 
     if (t === undefined){
       if (isLightMode) activateLightMode()
       else if (isDarkMode) activateDarkMode()
       else if (isNotSpecified || hasNoSupport){
         console.log('You specified no preference for a color scheme or your browser does not support it. I Schedule dark mode during night time.')
-        now = new Date();
-        hour = now.getHours();
-        isNight = hour < 6 || hour >= 18
+        var now = new Date()
+        var hour = now.getHours()
+        var isNight = hour < 6 || hour >= 18
         isNight ? activateDarkMode() : activateLightMode()
     }
     } else if (t == 'light') activateLightMode()

layout/includes/head/noscript.pug

@@ -0,0 +1,9 @@
+noscript. 
+  <style>
+  #page-header {
+    opacity: 1
+  }
+  .justified-gallery img{
+    opacity: 1
+  }
+  </style>

layout/includes/head/subtitle.pug

@@ -0,0 +1,116 @@
+if theme.subtitle.enable
+  - var source = theme.subtitle.source
+  - var subtitleEffect = theme.subtitle.effect
+
+  if subtitleEffect
+    script(src=url_for(theme.CDN.typed))
+
+  if source == '1'
+    script.
+      var subtitleEffect = !{subtitleEffect}
+      fetch('https://api.ooopn.com/ciba/api.php',)
+      .then(function (res){
+        return res.json();
+      })
+      .then(function (data) {
+        if (subtitleEffect){
+          var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
+          var both = sub.unshift(data['ciba-en'],data.ciba)
+          var typed = new Typed("#subtitle", {
+            strings: sub,
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{theme.subtitle.loop},
+            backSpeed: 50
+          });
+        }else{
+          document.getElementById("subtitle").innerHTML = data['ciba-en']
+        }
+      })
+      .catch(function (err) {
+        console.error(err);
+      })
+
+  else if source == '2'
+    script.
+      var subtitleEffect = !{subtitleEffect}
+      fetch('https://v1.hitokoto.cn')
+      .then(function (res){
+        return res.json();
+      })
+      .then(function (data) {
+        if (subtitleEffect){
+          var from = '出自 ' + data.from
+          var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
+          var both = sub.unshift(data.hitokoto,from)  
+          var typed = new Typed("#subtitle", {
+            strings: sub,
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{theme.subtitle.loop},
+            backSpeed: 50
+          });
+        }else{
+          document.getElementById("subtitle").innerHTML = data.hitokoto        
+        }
+      })
+      .catch(function (err) {
+        console.error(err);
+      })
+
+  else if source == "3"
+    script(type="text/javascript" src="http://yijuzhan.com/api/word.php?m=js")
+    script.
+      var subtitleEffect = !{subtitleEffect}
+      var con = str[0];
+      if (subtitleEffect){
+        var from = "出自 " + str[1];
+        var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
+        var both = sub.unshift(con,from)
+        var typed = new Typed("#subtitle", {
+          strings: sub,
+          startDelay: 300,
+          typeSpeed: 150,
+          loop: !{theme.subtitle.loop},
+          backSpeed: 50
+        });
+      }else{
+        document.getElementById("subtitle").innerHTML = con
+      }
+
+  else if source == '4'
+    script(type="text/javascript" src="https://sdk.jinrishici.com/v2/browser/jinrishici.js" charset="utf-8")
+    script.
+      var subtitleEffect = !{subtitleEffect}
+      jinrishici.load(function(result) {
+        if (subtitleEffect){
+          var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
+          var content = result.data.content;
+          var both = sub.unshift(content)
+          var typed = new Typed("#subtitle", {
+            strings: sub,
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{theme.subtitle.loop},
+            backSpeed: 50
+          });
+        }else{
+          document.getElementById("subtitle").innerHTML = result.data.content        
+        }
+      })
+
+  else
+    - var subtitle = theme.subtitle.sub[0]
+    script.
+      var subtitleEffect = !{subtitleEffect}
+      if (subtitleEffect){ 
+        var typed = new Typed("#subtitle", {
+          strings: '!{theme.subtitle.sub}'.split(","),
+          startDelay: 300,
+          typeSpeed: 150,
+          loop: !{theme.subtitle.loop},
+          backSpeed: 50
+        })
+      }else{
+        document.getElementById("subtitle").innerHTML = '!{subtitle}'
+        }