hexo-theme-fluid 1.8.13 → 1.9.1

package/source/js/color-schema.js

@@ -1,7 +1,7 @@
 /* global Fluid */
 
 /**
- * Modify by https://blog.skk.moe/post/hello-darkmode-my-old-friend/
+ * Modified from https://blog.skk.moe/post/hello-darkmode-my-old-friend/
  */
 (function(window, document) {
   var rootElement = document.documentElement;
@@ -101,6 +101,9 @@
     // 根据当前模式设置图标
     setButtonIcon(current);
 
+    // 设置代码高亮
+    setHighlightCSS(current);
+
     // 设置其他应用
     setApplications(current);
   }
@@ -176,6 +179,39 @@
     }
   }
 
+  function setHighlightCSS(schema) {
+    // 启用对应的代码高亮的样式
+    var lightCss = document.getElementById('highlight-css');
+    var darkCss = document.getElementById('highlight-css-dark');
+    if (schema === 'dark') {
+      if (darkCss) {
+        darkCss.removeAttribute('disabled');
+      }
+      if (lightCss) {
+        lightCss.setAttribute('disabled', '');
+      }
+    } else {
+      if (lightCss) {
+        lightCss.removeAttribute('disabled');
+      }
+      if (darkCss) {
+        darkCss.setAttribute('disabled', '');
+      }
+    }
+
+    setTimeout(function() {
+      // 设置代码块组件样式
+      document.querySelectorAll('.markdown-body pre').forEach((pre) => {
+        var cls = Fluid.utils.getBackgroundLightness(pre) >= 0 ? 'code-widget-light' : 'code-widget-dark';
+        var widget = pre.querySelector('.code-widget-light, .code-widget-dark');
+        if (widget) {
+          widget.classList.remove('code-widget-light', 'code-widget-dark');
+          widget.classList.add(cls);
+        }
+      });
+    }, 200);
+  }
+
   function setApplications(schema) {
     // 设置 remark42 评论主题
     if (window.REMARK42) {
@@ -188,18 +224,27 @@
     }
 
     // 设置 utterances 评论主题
-    var utterances = document.querySelector('iframe');
+    var utterances = document.querySelector('.utterances-frame');
     if (utterances) {
-      var theme = window.UtterancesThemeLight;
-      if (schema === 'dark') {
-        theme = window.UtterancesThemeDark;
-      }
+      var utterancesTheme = schema === 'dark' ? window.UtterancesThemeDark : window.UtterancesThemeLight;
       const message = {
         type : 'set-theme',
-        theme: theme
+        theme: utterancesTheme
       };
       utterances.contentWindow.postMessage(message, 'https://utteranc.es');
     }
+
+    // 设置 giscus 评论主题
+    var giscus = document.querySelector('iframe.giscus-frame');
+    if (giscus) {
+      var giscusTheme = schema === 'dark' ? window.GiscusThemeDark : window.GiscusThemeLight;
+      const message = {
+        setConfig: {
+          theme: giscusTheme,
+        }
+      };
+      giscus.contentWindow.postMessage({ 'giscus': message }, 'https://giscus.app');
+    }
   }
 
   // 当页面加载时，将显示模式设置为 localStorage 中自定义的值（如果有的话）

package/source/js/events.js

@@ -10,6 +10,9 @@ Fluid.events = {
 
   registerNavbarEvent: function() {
     var navbar = jQuery('#navbar');
+    if (navbar.length === 0) {
+      return;
+    }
     var submenu = jQuery('#navbar .dropdown-menu');
     if (navbar.offset().top > 0) {
       navbar.removeClass('navbar-dark');
@@ -33,8 +36,8 @@ Fluid.events = {
   },
 
   registerParallaxEvent: function() {
-    var bg = jQuery('#banner[parallax="true"]');
-    if (bg.length === 0) {
+    var ph = jQuery('#banner[parallax="true"]');
+    if (ph.length === 0) {
       return;
     }
     var board = jQuery('#board');
@@ -42,22 +45,19 @@ Fluid.events = {
       return;
     }
     var parallax = function() {
-      var oVal = jQuery(window).scrollTop() / 5;
-      var offset = parseInt(board.css('margin-top'), 0);
+      var pxv = jQuery(window).scrollTop() / 5;
+      var offset = parseInt(board.css('margin-top'), 10);
       var max = 96 + offset;
-      if (oVal > max) {
-        oVal = max;
+      if (pxv > max) {
+        pxv = max;
       }
-      bg.css({
-        transform          : 'translate3d(0,' + oVal + 'px,0)',
-        '-webkit-transform': 'translate3d(0,' + oVal + 'px,0)',
-        '-ms-transform'    : 'translate3d(0,' + oVal + 'px,0)',
-        '-o-transform'     : 'translate3d(0,' + oVal + 'px,0)'
+      ph.css({
+        transform: 'translate3d(0,' + pxv + 'px,0)'
       });
-      var toc = jQuery('#toc');
-      if (toc) {
-        jQuery('#toc-ctn').css({
-          'padding-top': oVal + 'px'
+      var sideCol = jQuery('.side-col');
+      if (sideCol) {
+        sideCol.css({
+          'padding-top': pxv + 'px'
         });
       }
     };

package/source/js/leancloud.js

@@ -94,7 +94,7 @@
   }
 
   function addCount(Counter) {
-    var enableIncr = CONFIG.web_analytics.enable && validHost();
+    var enableIncr = CONFIG.web_analytics.enable && !Fluid.ctx.dnt && validHost();
     var getterArr = [];
     var incrArr = [];
 
@@ -155,6 +155,13 @@
   var appKey = CONFIG.web_analytics.leancloud.app_key;
   var serverUrl = CONFIG.web_analytics.leancloud.server_url;
 
+  if (!appId) {
+    throw new Error('LeanCloud appId is empty');
+  }
+  if (!appKey) {
+    throw new Error('LeanCloud appKey is empty');
+  }
+
   function fetchData(api_server) {
     var Counter = (method, url, data) => {
       return fetch(`${api_server}/1.1${url}`, {
@@ -171,7 +178,7 @@
     addCount(Counter);
   }
 
-  var apiServer = appId.slice(-9) !== '-MdYXbMMI' ? serverUrl : `https://${appId.slice(0, 8).toLowerCase()}.api.lncldglobal.com`;
+  var apiServer = serverUrl || `https://${appId.slice(0, 8).toLowerCase()}.api.lncldglobal.com`;
 
   if (apiServer) {
     fetchData(apiServer);

package/source/js/local-search.js

@@ -1,7 +1,7 @@
-/* global CONFIG, jQuery */
+/* global CONFIG */
 
 (function() {
-  // Modify by [hexo-generator-search](https://github.com/wzpan/hexo-generator-search)
+  // Modified from [hexo-generator-search](https://github.com/wzpan/hexo-generator-search)
   function localSearchFunc(path, searchSelector, resultSelector) {
     'use strict';
     // 0x00. environment initialization

package/source/js/plugins.js

@@ -1,4 +1,4 @@
-/* global Fluid, CONFIG, jQuery */
+/* global Fluid, CONFIG */
 
 HTMLElement.prototype.wrap = function(wrapper) {
   this.parentNode.insertBefore(wrapper, this);
@@ -26,37 +26,12 @@ Fluid.plugins = {
       subtitle.innerText = '';
     }
     jQuery(document).ready(function() {
-      jQuery('.typed-cursor').addClass('h2');
       typed.start();
     });
   },
 
-  initTocBot: function() {
-    var toc = jQuery('#toc');
-    if (toc.length === 0 || !window.tocbot) { return; }
-    var boardCtn = jQuery('#board-ctn');
-    var boardTop = boardCtn.offset().top;
-
-    window.tocbot.init({
-      tocSelector     : '#toc-body',
-      contentSelector : '.markdown-body',
-      headingSelector : CONFIG.toc.headingSelector || 'h1,h2,h3,h4,h5,h6',
-      linkClass       : 'tocbot-link',
-      activeLinkClass : 'tocbot-active-link',
-      listClass       : 'tocbot-list',
-      isCollapsedClass: 'tocbot-is-collapsed',
-      collapsibleClass: 'tocbot-is-collapsible',
-      collapseDepth   : CONFIG.toc.collapseDepth || 0,
-      scrollSmooth    : true,
-      headingsOffset  : -boardTop
-    });
-    if (jQuery('.toc-list-item').length > 0) {
-      toc.css('visibility', 'visible');
-    }
-  },
-
-  initFancyBox: function(selector) {
-    if (!('fancybox' in jQuery)) { return; }
+  fancyBox: function(selector) {
+    if (!CONFIG.image_zoom.enable || !('fancybox' in jQuery)) { return; }
 
     jQuery(selector || '.markdown-body :not(a) > img, .markdown-body > img').each(function() {
       var $image = jQuery(this);
@@ -79,16 +54,17 @@ Fluid.plugins = {
         <a class="fancybox fancybox.image" href="${imageUrl}"
           itemscope itemtype="http://schema.org/ImageObject" itemprop="url"></a>`
       ).parent('a');
-      if ($image.is('.group-image-container img')) {
-        $imageWrap.attr('data-fancybox', 'group').attr('rel', 'group');
-      } else {
-        $imageWrap.attr('data-fancybox', 'default').attr('rel', 'default');
-      }
+      if ($imageWrap.length !== 0) {
+        if ($image.is('.group-image-container img')) {
+          $imageWrap.attr('data-fancybox', 'group').attr('rel', 'group');
+        } else {
+          $imageWrap.attr('data-fancybox', 'default').attr('rel', 'default');
+        }
 
-      var imageTitle = $image.attr('title') || $image.attr('alt');
-      if (imageTitle) {
-        $imageWrap.append(`<p class="image-caption">${imageTitle}</p>`);
-        $imageWrap.attr('title', imageTitle).attr('data-caption', imageTitle);
+        var imageTitle = $image.attr('title') || $image.attr('alt');
+        if (imageTitle) {
+          $imageWrap.attr('title', imageTitle).attr('data-caption', imageTitle);
+        }
       }
     });
 
@@ -103,65 +79,21 @@ Fluid.plugins = {
     });
   },
 
-  initAnchor: function() {
-    if (!('anchors' in window)) { return; }
-
-    window.anchors.options = {
-      placement: CONFIG.anchorjs.placement,
-      visible  : CONFIG.anchorjs.visible
-    };
-    if (CONFIG.anchorjs.icon) {
-      window.anchors.options.icon = CONFIG.anchorjs.icon;
-    }
-    var el = (CONFIG.anchorjs.element || 'h1,h2,h3,h4,h5,h6').split(',');
-    var res = [];
-    for (const item of el) {
-      res.push('.markdown-body > ' + item);
-    }
-    window.anchors.add(res.join(', '));
-  },
-
-  initCopyCode: function() {
-    if (!('ClipboardJS' in window)) { return; }
-
-    function getBgClass(ele) {
-      if (ele.length === 0) {
-        return 'copy-btn-dark';
-      }
-      var rgbArr = ele.css('background-color').replace(/rgba*\(/, '').replace(')', '').split(',');
-      var color = (0.213 * rgbArr[0]) + (0.715 * rgbArr[1]) + (0.072 * rgbArr[2]) > 255 / 2;
-      return color ? 'copy-btn-dark' : 'copy-btn-light';
-    }
+  imageCaption: function(selector) {
+    if (!CONFIG.image_caption.enable) { return; }
 
-    var copyHtml = '';
-    copyHtml += '<button class="copy-btn" data-clipboard-snippet="">';
-    copyHtml += '<i class="iconfont icon-copy"></i><span>Copy</span>';
-    copyHtml += '</button>';
-    var blockElement = jQuery('.markdown-body pre');
-    blockElement.each(function() {
-      const pre = jQuery(this);
-      if (pre.find('code.mermaid').length > 0) {
-        return;
-      }
-      if (pre.find('span.line').length > 0) {
-        return;
-      }
-      pre.append(copyHtml);
-    });
-    var clipboard = new window.ClipboardJS('.copy-btn', {
-      target: function(trigger) {
-        return trigger.previousElementSibling;
+    jQuery(selector || `.markdown-body > p > img, .markdown-body > figure > img,
+      .markdown-body > p > a.fancybox, .markdown-body > figure > a.fancybox`).each(function() {
+      var $target = jQuery(this);
+      var $figcaption = $target.next('figcaption');
+      if ($figcaption.length !== 0) {
+        $figcaption.addClass('image-caption');
+      } else {
+        var imageTitle = $target.attr('title') || $target.attr('alt');
+        if (imageTitle) {
+          $target.after(`<figcaption aria-hidden="true" class="image-caption">${imageTitle}</figcaption>`);
+        }
       }
     });
-    jQuery('.copy-btn').addClass(getBgClass(blockElement));
-    clipboard.on('success', function(e) {
-      e.clearSelection();
-      var tmp = e.trigger.outerHTML;
-      e.trigger.innerHTML = 'Success';
-      setTimeout(function() {
-        e.trigger.outerHTML = tmp;
-      }, 2000);
-    });
   }
-
 };

package/source/js/utils.js

@@ -26,7 +26,7 @@ Fluid.utils = {
   },
 
   elementVisible: function(element, offsetFactor) {
-    offsetFactor = (offsetFactor && offsetFactor >= 0) ? offsetFactor : 0;
+    offsetFactor = offsetFactor && offsetFactor >= 0 ? offsetFactor : 0;
     var rect = element.getBoundingClientRect();
     var height = window.innerHeight || document.documentElement.clientHeight;
     var top = rect.top;
@@ -36,13 +36,13 @@ Fluid.utils = {
 
   waitElementVisible: function(selectorOrElement, callback, offsetFactor) {
     var runningOnBrowser = typeof window !== 'undefined';
-    var isBot = (runningOnBrowser && !('onscroll' in window)) ||
-      (typeof navigator !== 'undefined' && /(gle|ing|ro|msn)bot|crawl|spider|yand|duckgo/i.test(navigator.userAgent));
+    var isBot = (runningOnBrowser && !('onscroll' in window))
+      || (typeof navigator !== 'undefined' && /(gle|ing|ro|msn)bot|crawl|spider|yand|duckgo/i.test(navigator.userAgent));
     if (!runningOnBrowser || isBot) {
       return;
     }
 
-    offsetFactor = (offsetFactor && offsetFactor >= 0) ? offsetFactor : 0;
+    offsetFactor = offsetFactor && offsetFactor >= 0 ? offsetFactor : 0;
 
     function waitInViewport(element) {
       if (Fluid.utils.elementVisible(element, offsetFactor)) {
@@ -81,8 +81,8 @@ Fluid.utils = {
 
   waitElementLoaded: function(selector, callback) {
     var runningOnBrowser = typeof window !== 'undefined';
-    var isBot = (runningOnBrowser && !('onscroll' in window)) ||
-      (typeof navigator !== 'undefined' && /(gle|ing|ro|msn)bot|crawl|spider|yand|duckgo/i.test(navigator.userAgent));
+    var isBot = (runningOnBrowser && !('onscroll' in window))
+      || (typeof navigator !== 'undefined' && /(gle|ing|ro|msn)bot|crawl|spider|yand|duckgo/i.test(navigator.userAgent));
     if (!runningOnBrowser || isBot) {
       return;
     }
@@ -130,10 +130,9 @@ Fluid.utils = {
         s.onload = onload;
       }
     }
-    var e = document.getElementsByTagName('script')[0]
-    || document.getElementsByTagName('head')[0]
-    || document.head || document.documentElement;
-    e.parentNode.insertBefore(s, e);
+    var ss = document.getElementsByTagName('script');
+    var e = ss.length > 0 ? ss[ss.length - 1] : document.head || document.documentElement;
+    e.parentNode.insertBefore(s, e.nextSibling);
   },
 
   createCssLink: function(url) {
@@ -147,17 +146,34 @@ Fluid.utils = {
     e.parentNode.insertBefore(l, e);
   },
 
-  loadComments: function(selectors, loadFunc) {
+  loadComments: function(selector, loadFunc) {
     var ele = document.querySelector('#comments[lazyload]');
     if (ele) {
       var callback = function() {
         loadFunc();
         ele.removeAttribute('lazyload');
       };
-      Fluid.utils.waitElementVisible(selectors, callback, CONFIG.lazyload.offset_factor);
+      Fluid.utils.waitElementVisible(selector, callback, CONFIG.lazyload.offset_factor);
     } else {
       loadFunc();
     }
+  },
+
+  getBackgroundLightness(selectorOrElement) {
+    var ele = selectorOrElement;
+    if (typeof selectorOrElement === 'string') {
+      ele = document.querySelector(selectorOrElement);
+    }
+    var view = ele.ownerDocument.defaultView;
+    if (!view) {
+      view = window;
+    }
+    var rgbArr = view.getComputedStyle(ele).backgroundColor.replace(/rgba*\(/, '').replace(')', '').split(/,\s*/);
+    if (rgbArr.length < 3) {
+      return 0;
+    }
+    var colorCast = (0.213 * rgbArr[0]) + (0.715 * rgbArr[1]) + (0.072 * rgbArr[2]);
+    return colorCast === 0 || colorCast > 255 / 2 ? 1 : -1;
   }
 
 };

package/.editorconfig

@@ -1,13 +0,0 @@
-# editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false

package/.eslintrc

@@ -1,224 +0,0 @@
-{
-  "extends": [
-    "eslint:recommended"
-  ],
-  "parserOptions": {
-    "ecmaVersion": 2018
-  },
-  "rules": {
-    // Override recomennded
-    "no-console": [
-      2,
-      {
-        "allow": [
-          "warn"
-        ]
-      }
-    ],
-    "no-empty": [
-      2,
-      {
-        "allowEmptyCatch": true
-      }
-    ],
-    "no-unused-vars": [
-      2,
-      {
-        "args": "none"
-      }
-    ],
-    // Possible Errors
-    "no-extra-parens": [
-      2,
-      "all",
-      {
-        "conditionalAssign": false,
-        "returnAssign": false,
-        "nestedBinaryExpressions": false,
-        "enforceForArrowConditionals": false
-      }
-    ],
-    // Best Practices
-    "array-callback-return": 2,
-    "block-scoped-var": 2,
-    "curly": [
-      2,
-      "multi-line"
-    ],
-    "dot-location": [
-      2,
-      "property"
-    ],
-    "dot-notation": 2,
-    "eqeqeq": [
-      2,
-      "smart"
-    ],
-    "no-else-return": 2,
-    "no-eval": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-extra-label": 2,
-    "no-implicit-globals": 2,
-    "no-implied-eval": 2,
-    "no-lone-blocks": 2,
-    "no-loop-func": 2,
-    "no-multi-spaces": [
-      2,
-      {
-        "exceptions": {
-          "ImportDeclaration": true,
-          "VariableDeclarator": true,
-          "FunctionDeclarator": true,
-          "AssignmentExpression": true,
-          "CallExpression": true
-        }
-      }
-    ],
-    "no-multi-str": 2,
-    "no-new": 2,
-    "no-new-func": 2,
-    "no-new-wrappers": 2,
-    "no-proto": 2,
-    "no-return-assign": 2,
-    "no-self-compare": 2,
-    "no-sequences": 2,
-    "no-throw-literal": 2,
-    "no-unused-expressions": [
-      2,
-      {
-        "allowShortCircuit": true,
-        "allowTernary": true
-      }
-    ],
-    "no-useless-call": 2,
-    "no-useless-concat": 2,
-    "no-useless-return": 2,
-    "no-void": 2,
-    "no-with": 2,
-    "prefer-promise-reject-errors": 2,
-    "radix": 2,
-    "wrap-iife": [
-      2,
-      "inside"
-    ],
-    "yoda": 2,
-    // Variables
-    "no-label-var": 2,
-    "no-shadow-restricted-names": 2,
-    "no-undef-init": 2,
-    // Node.js and CommonJS
-    "handle-callback-err": 2,
-    "no-path-concat": 2,
-    // Stylistic Issues
-    "array-bracket-spacing": 2,
-    "block-spacing": 2,
-    "brace-style": [
-      2,
-      "1tbs",
-      {
-        "allowSingleLine": true
-      }
-    ],
-    "comma-dangle": 2,
-    "comma-spacing": 2,
-    "comma-style": 2,
-    "computed-property-spacing": 2,
-    "eol-last": 2,
-    "func-call-spacing": 2,
-    "indent": [
-      2,
-      2,
-      {
-        "SwitchCase": 1,
-        "VariableDeclarator": {
-          "var": 2,
-          "let": 2,
-          "const": 3
-        }
-      }
-    ],
-    "key-spacing": [
-      2,
-      {
-        "align": "colon",
-        "beforeColon": false
-      }
-    ],
-    "keyword-spacing": 2,
-    "linebreak-style": ["off", "window"],
-    "lines-around-comment": 2,
-    "new-cap": [
-      2,
-      {
-        "capIsNew": false
-      }
-    ],
-    "new-parens": 2,
-    "no-array-constructor": 2,
-    "no-mixed-operators": 2,
-    "no-multiple-empty-lines": 2,
-    "no-nested-ternary": 2,
-    "no-new-object": 2,
-    "no-trailing-spaces": 2,
-    "no-unneeded-ternary": 2,
-    "no-whitespace-before-property": 2,
-    "object-curly-spacing": [
-      2,
-      "always"
-    ],
-    "one-var": [
-      2,
-      {
-        "uninitialized": "always",
-        "initialized": "never"
-      }
-    ],
-    "operator-linebreak": [
-      2,
-      "before"
-    ],
-    "quotes": [
-      2,
-      "single"
-    ],
-    "semi": 2,
-    "semi-spacing": 2,
-    "space-before-blocks": 2,
-    "space-before-function-paren": [
-      2,
-      "never"
-    ],
-    "space-in-parens": 2,
-    "space-infix-ops": 2,
-    "space-unary-ops": 2,
-    "template-tag-spacing": 2,
-    "unicode-bom": 2,
-    // ECMAScript 6
-    "arrow-spacing": 2,
-    "generator-star-spacing": [
-      2,
-      "after"
-    ],
-    "no-confusing-arrow": [
-      2,
-      {
-        "allowParens": true
-      }
-    ],
-    "no-duplicate-imports": 2,
-    "no-useless-computed-key": 2,
-    "no-useless-constructor": 2,
-    "no-useless-rename": 2,
-    "rest-spread-spacing": 2,
-    "template-curly-spacing": 2,
-    "yield-star-spacing": 2
-  },
-  "env": {
-    "browser": true,
-    "jquery": true,
-    "mocha": true,
-    "node": true,
-    "es6": true
-  }
-}

package/.gitattributes

@@ -1 +0,0 @@
-source/lib/* linguist-vendored