🏷️ 2.3.0發佈

source/js/main.js

@@ -247,18 +247,23 @@ $(function () {
 
   /**
    * 代碼
+   * 只適用於Hexo默認的代碼渲染
    */
-  const isHighlightCopy = GLOBAL_CONFIG.highlightCopy
-  const isHighlightLang = GLOBAL_CONFIG.highlightLang
-  const isHighlightShrink = GLOBAL_CONFIG.highlightShrink
   const $figureHighlight = $('figure.highlight')
-  if (isHighlightCopy || isHighlightLang || isHighlightShrink !== 'none') {
-    $figureHighlight.wrap('<div class="code-area-wrap"></div>').before('<div class="highlight-tools"></div>')
-  }
 
-  /**
+  if ($figureHighlight.length) {
+    const isHighlightCopy = GLOBAL_CONFIG.highlightCopy
+    const isHighlightLang = GLOBAL_CONFIG.highlightLang
+    const isHighlightShrink = GLOBAL_CONFIG.highlightShrink
+
+    if (isHighlightCopy || isHighlightLang || isHighlightShrink !== 'none') {
+      $figureHighlight.wrap('<div class="code-area-wrap"></div>').before('<div class="highlight-tools"></div>')
+    }
+
+    /**
    * 代碼收縮
    */
+<<<<<<< HEAD
   const $highlightTools = $('.highlight-tools')
   if (isHighlightShrink === 'true') {
     $highlightTools.append('<i class="fa fa-angle-down code-expand code-closed" aria-hidden="true"></i>')
@@ -274,94 +279,129 @@ $(function () {
     } else {
       $table.css('display', 'none')
       $(this).addClass('code-closed')
+=======
+    const $highlightTools = $('.highlight-tools')
+    if (isHighlightShrink === 'true') {
+      $highlightTools.append('<i class="fa fa-angle-down code-expand code-closed" aria-hidden="true"></i>')
+    } else if (isHighlightShrink === 'false') {
+      $highlightTools.append('<i class="fa fa-angle-down code-expand" aria-hidden="true"></i>')
+>>>>>>> dev
     }
-  })
 
-  /**
+    $(document).on('click', '.highlight-tools >.code-expand', function () {
+      var $table = $(this).parent().next()
+      if ($(this).hasClass('code-closed')) {
+        $table.css('display', 'block')
+        $(this).removeClass('code-closed')
+      } else {
+        $table.css('display', 'none')
+        $(this).addClass('code-closed')
+      }
+    })
+
+    /**
     * 代碼語言
   */
-  if (isHighlightLang) {
-    var langNameIndex, langName
-    $figureHighlight.each(function () {
-      langNameIndex = langName = $(this).attr('class').split(' ')[1]
-      if (langNameIndex === 'plain') langName = 'Code'
-      $(this).prev().append('<div class="code-lang">' + langName + '</div>')
-    })
-  }
-  /**
+    if (isHighlightLang) {
+      var langNameIndex, langName
+      $figureHighlight.each(function () {
+        langNameIndex = langName = $(this).attr('class').split(' ')[1]
+        if (langNameIndex === 'plain') langName = 'Code'
+        $(this).prev().append('<div class="code-lang">' + langName + '</div>')
+      })
+    }
+    /**
    * 代碼copy
    * copy function
    */
-  if (isHighlightCopy) {
-    $highlightTools.append('<div class="copy-notice"></div><i class="fa fa-clipboard" aria-hidden="true"></i>')
-    var copy = function (text, ctx) {
-      if (document.queryCommandSupported && document.queryCommandSupported('copy')) {
-        try {
-          document.execCommand('copy') // Security exception may be thrown by some browsers.
-          if (isSnackbar) {
-            snackbarShow(GLOBAL_CONFIG.copy.success)
-          } else {
-            $(ctx).prev('.copy-notice')
-              .text(GLOBAL_CONFIG.copy.success)
-              .animate({
-                opacity: 1,
-                right: 30
-              }, 450, function () {
-                setTimeout(function () {
-                  $(ctx).prev('.copy-notice').animate({
-                    opacity: 0,
-                    right: 0
-                  }, 650)
-                }, 400)
-              })
+    if (isHighlightCopy) {
+      $highlightTools.append('<div class="copy-notice"></div><i class="fa fa-clipboard" aria-hidden="true"></i>')
+      var copy = function (text, ctx) {
+        if (document.queryCommandSupported && document.queryCommandSupported('copy')) {
+          try {
+            document.execCommand('copy') // Security exception may be thrown by some browsers.
+            if (isSnackbar) {
+              snackbarShow(GLOBAL_CONFIG.copy.success)
+            } else {
+              $(ctx).prev('.copy-notice')
+                .text(GLOBAL_CONFIG.copy.success)
+                .animate({
+                  opacity: 1,
+                  right: 30
+                }, 450, function () {
+                  setTimeout(function () {
+                    $(ctx).prev('.copy-notice').animate({
+                      opacity: 0,
+                      right: 0
+                    }, 650)
+                  }, 400)
+                })
+            }
+          } catch (ex) {
+            if (isSnackbar) {
+              snackbarShow(GLOBAL_CONFIG.copy.success)
+            } else {
+              $(ctx).prev('.copy-notice')
+                .text(GLOBAL_CONFIG.copy.error)
+                .animate({
+                  opacity: 1,
+                  right: 30
+                }, 650, function () {
+                  setTimeout(function () {
+                    $(ctx).prev('.copy-notice').animate({
+                      opacity: 0,
+                      right: 0
+                    }, 650)
+                  }, 400)
+                })
+              return false
+            }
           }
-        } catch (ex) {
-          if (isSnackbar) {
-            snackbarShow(GLOBAL_CONFIG.copy.success)
-          } else {
-            $(ctx).prev('.copy-notice')
-              .text(GLOBAL_CONFIG.copy.error)
-              .animate({
-                opacity: 1,
-                right: 30
-              }, 650, function () {
-                setTimeout(function () {
-                  $(ctx).prev('.copy-notice').animate({
-                    opacity: 0,
-                    right: 0
-                  }, 650)
-                }, 400)
-              })
-            return false
-          }
-        }
-      } else {
-        if (isSnackbar) {
-          snackbarShow(GLOBAL_CONFIG.copy.noSupport)
         } else {
-          $(ctx).prev('.copy-notice').text(GLOBAL_CONFIG.copy.noSupport)
+          if (isSnackbar) {
+            snackbarShow(GLOBAL_CONFIG.copy.noSupport)
+          } else {
+            $(ctx).prev('.copy-notice').text(GLOBAL_CONFIG.copy.noSupport)
+          }
         }
       }
-    }
 
-    // click events
-    $(document).on('click', '.highlight-tools>.fa-clipboard', function () {
-      var selection = window.getSelection()
-      var range = document.createRange()
-      range.selectNodeContents($(this).parent().next().find('.code pre')[0])
-      selection.removeAllRanges()
-      selection.addRange(range)
-      var text = selection.toString()
-      copy(text, this)
-      selection.removeAllRanges()
+      // click events
+      $(document).on('click', '.highlight-tools>.fa-clipboard', function () {
+        var selection = window.getSelection()
+        var range = document.createRange()
+        range.selectNodeContents($(this).parent().next().find('.code pre')[0])
+        selection.removeAllRanges()
+        selection.addRange(range)
+        var text = selection.toString()
+        copy(text, this)
+        selection.removeAllRanges()
+      })
+    }
+  }
+
+  /**
+ * PhotoFigcaption
+ */
+  function addPhotoFigcaption () {
+    var images = $('#article-container img')
+    images.each(function (i, o) {
+      var $this = $(o)
+      if ($this.attr('alt')) {
+        var t = $('<div class="img-alt is-center">' + $this.attr('alt') + '</div>')
+        $this.after(t)
+      }
     })
   }
+  if (GLOBAL_CONFIG.isPhotoFigcaption) addPhotoFigcaption()
 
   /**
    * justified-gallery 圖庫排版
    */
   var $justifiedGallery = $('.justified-gallery')
+  var isJustifiedGallery = false
   if ($justifiedGallery.length) {
+    isJustifiedGallery = true
     var $imgList = $justifiedGallery.find('img')
     $imgList.unwrap()
     if ($imgList.length) {
@@ -372,11 +412,19 @@ $(function () {
     }
     $('head').append('<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/justifiedGallery/dist/css/justifiedGallery.min.css">')
     loadScript('https://cdn.jsdelivr.net/npm/justifiedGallery/dist/js/jquery.justifiedGallery.min.js', function () {
-      $justifiedGallery.not($('.hide-content .justified-gallery')).justifiedGallery({
-        rowHeight: 220,
-        margins: 4
-      })
+      initJustifiedGallery($justifiedGallery)
     })
+
+    var initJustifiedGallery = function (selector) {
+      selector.each(function (i, o) {
+        if ($(this).is(':visible')) {
+          $(this).justifiedGallery({
+            rowHeight: 220,
+            margins: 4
+          })
+        }
+      })
+    }
   }
 
   /**
@@ -503,8 +551,8 @@ $(function () {
     }
 
     var updateAnchor = function (anchor) {
-      if (window.history.replaceState && anchor !== window.location.hash) {
-        window.history.replaceState(undefined, undefined, anchor)
+      if (anchor !== window.location.hash) {
+        location.replace(window.location.href.split('#')[0] + anchor)
       }
     }
 
@@ -708,6 +756,9 @@ $(function () {
     interval = setInterval(showDateTime, 10000)
   }
 
+  /**
+   * 百度推送
+   */
   if (GLOBAL_CONFIG.baiduPush) {
     (function () {
       var bp = document.createElement('script')
@@ -726,15 +777,20 @@ $(function () {
    * tag-hide
    */
   var $hideInline = $('.hide-button')
-  $hideInline.on('click', function (e) {
-    e.preventDefault()
-    $(this).hide()
-    var $hideContent = $(this).next('.hide-content')
-    $hideContent.show()
-    $hideContent.find('.justified-gallery').justifiedGallery({
-      rowHeight: 220,
-      margins: 4
+  if ($hideInline.length) {
+    $hideInline.on('click', function (e) {
+      e.preventDefault()
+      var $this = $(this)
+      var $hideContent = $(this).next('.hide-content')
+      $this.toggleClass('open')
+      $hideContent.toggle()
+      if ($this.hasClass('open')) {
+        if (isJustifiedGallery && $hideContent.find('.justified-gallery').length > 0) {
+          initJustifiedGallery($hideContent.find('.justified-gallery'))
+        }
+      }
     })
+<<<<<<< HEAD
   })
 
   function addPhotoFigcaption () {
@@ -748,4 +804,7 @@ $(function () {
     })
   }
   if (GLOBAL_CONFIG.isPhotoFigcaption) addPhotoFigcaption()
+=======
+  }
+>>>>>>> dev
 })

source/js/search/local-search.js

@@ -1,7 +1,10 @@
 $(function () {
   var loadFlag = false
   $('a.social-icon.search').on('click', function () {
-    $('body').css({ width: '100%', overflow: 'hidden' })
+    $('body').css({
+      width: '100%',
+      overflow: 'hidden'
+    })
     $('.search-dialog').css('display', 'block')
     $('#local-search-input input').focus()
     $('.search-mask').fadeIn()
@@ -52,6 +55,7 @@ $(function () {
             url: $('url', this).text()
           }
         }).get()
+
         var $input = $('#local-search-input input')[0]
         var $resultContent = $('#local-hits')[0]
         $input.addEventListener('input', function () {
@@ -66,13 +70,17 @@ $(function () {
           // perform local searching
           datas.forEach(function (data) {
             var isMatch = true
+            if (!data.title || data.title.trim() === '') {
+              data.title = 'Untitled'
+            }
             var dataTitle = data.title.trim().toLowerCase()
             var dataContent = data.content.trim().replace(/<[^>]+>/g, '').toLowerCase()
             var dataUrl = data.url
             var indexTitle = -1
             var indexContent = -1
+            var firstOccur = -1
             // only match artiles with not empty titles and contents
-            if (dataTitle !== '' && dataContent !== '') {
+            if (dataTitle !== '' || dataContent !== '') {
               keywords.forEach(function (keyword, i) {
                 indexTitle = dataTitle.indexOf(keyword)
                 indexContent = dataContent.indexOf(keyword)
@@ -82,20 +90,60 @@ $(function () {
                   if (indexContent < 0) {
                     indexContent = 0
                   }
+                  if (i === 0) {
+                    firstOccur = indexContent
+                  }
                 }
               })
+            } else {
+              isMatch = false
             }
+
             // show search results
             if (isMatch) {
-              str += '<div class="local-search__hit-item"><a href="' + dataUrl + '" class="search-result-title">' + dataTitle + '</a>' + '</div>'
-              count += 1
-              $('.local-search-stats__hr').show()
+              var content = data.content.trim().replace(/<[^>]+>/g, '')
+              if (firstOccur >= 0) {
+                // cut out 130 characters
+                var start = firstOccur - 30
+                var end = firstOccur + 100
+
+                if (start < 0) {
+                  start = 0
+                }
+
+                if (start === 0) {
+                  end = 100
+                }
+
+                if (end > content.length) {
+                  end = content.length
+                }
+
+                var matchContent = content.substring(start, end)
+
+                // highlight all keywords
+                keywords.forEach(function (keyword) {
+                  var regS = new RegExp(keyword, 'gi')
+                  matchContent = matchContent.replace(regS, '<span class="search-keyword">' + keyword + '</span>')
+                  dataTitle = dataTitle.replace(regS, '<span class="search-keyword">' + keyword + '</span>')
+                })
+
+                str += '<div class="local-search__hit-item"><a href="' + dataUrl + '" class="search-result-title">' + dataTitle + '</a>'
+                count += 1
+                $('.local-search-stats__hr').show()
+
+                if (dataContent !== '') {
+                  str += '<p class="search-result">' + matchContent + '...</p>'
+                }
+              }
+              str += '</div>'
             }
           })
           if (count === 0) {
             str += '<div id="local-search__hits-empty">' + GLOBAL_CONFIG.localSearch.languages.hits_empty.replace(/\$\{query}/, this.value.trim()) +
               '</div>'
           }
+          str += '</div>'
           $resultContent.innerHTML = str
         })
       }

source/js/third-party/canvas-ribbon.js

@@ -5,31 +5,32 @@
  * GitHub: https://github.com/hustcc/ribbon.js
  **/
 
-!(function () {
-
-  var script = document.getElementById('ribbon');
-  var mb = script.getAttribute("mobile");  
-  if (mb == 'false' && (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent))) {
+!(function() {
+  var script = document.getElementById("ribbon");
+  var mb = script.getAttribute("mobile");
+  if (
+    mb == "false" &&
+    /Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)
+  ) {
     return;
   }
 
   config = {
-    z: attr(script, 'zIndex', -1), // z-index
-    a: attr(script, 'alpha', 0.6), // alpha
-    s: attr(script, 'size', 90), // size
-    c: attr(script, 'data-click', true) // click-to-change
-  }
+    z: attr(script, "zIndex", -1), // z-index
+    a: attr(script, "alpha", 0.6), // alpha
+    s: attr(script, "size", 90), // size
+    c: attr(script, "data-click", true) // click-to-change
+  };
 
-
-  function attr (node, attr, default_value) {
+  function attr(node, attr, default_value) {
     if (default_value === true) {
-      return node.getAttribute(attr) || default_value
+      return node.getAttribute(attr) || default_value;
     }
-    return Number(node.getAttribute(attr)) || default_value
+    return Number(node.getAttribute(attr)) || default_value;
   }
 
-  var canvas = document.createElement('canvas'),
-    g2d = canvas.getContext('2d'),
+  var canvas = document.createElement("canvas"),
+    g2d = canvas.getContext("2d"),
     pr = window.devicePixelRatio || 1,
     width = window.innerWidth,
     height = window.innerHeight,
@@ -40,52 +41,67 @@
     r = 0,
     pi = m.PI * 2,
     cos = m.cos,
-    random = m.random
-  canvas.width = width * pr
-  canvas.height = height * pr
-  g2d.scale(pr, pr)
-  g2d.globalAlpha = config.a
+    random = m.random;
+  canvas.id = "ribbon-canvas";
+  canvas.width = width * pr;
+  canvas.height = height * pr;
+  g2d.scale(pr, pr);
+  g2d.globalAlpha = config.a;
   canvas.style.cssText =
-    'opacity: ' +
+    "opacity: " +
     config.a +
-    ';position:fixed;top:0;left:0;z-index: ' +
+    ";position:fixed;top:0;left:0;z-index: " +
     config.z +
-    ';width:100%;height:100%;pointer-events:none;'
+    ";width:100%;height:100%;pointer-events:none;";
   // create canvas
-  document.getElementsByTagName('body')[0].appendChild(canvas)
+  document.getElementsByTagName("body")[0].appendChild(canvas);
 
-  function redraw () {
-    g2d.clearRect(0, 0, width, height)
-    q = [{ x: 0, y: height * 0.7 + f }, { x: 0, y: height * 0.7 - f }]
-    while (q[1].x < width + f) draw(q[0], q[1])
+  function redraw() {
+    g2d.clearRect(0, 0, width, height);
+    q = [
+      {
+        x: 0,
+        y: height * 0.7 + f
+      },
+      {
+        x: 0,
+        y: height * 0.7 - f
+      }
+    ];
+    while (q[1].x < width + f) draw(q[0], q[1]);
   }
-  function draw (i, j) {
-    g2d.beginPath()
-    g2d.moveTo(i.x, i.y)
-    g2d.lineTo(j.x, j.y)
+
+  function draw(i, j) {
+    g2d.beginPath();
+    g2d.moveTo(i.x, i.y);
+    g2d.lineTo(j.x, j.y);
     var k = j.x + (random() * 2 - 0.25) * f,
-      n = line(j.y)
-    g2d.lineTo(k, n)
-    g2d.closePath()
-    r -= pi / -50
+      n = line(j.y);
+    g2d.lineTo(k, n);
+    g2d.closePath();
+    r -= pi / -50;
     g2d.fillStyle =
-      '#' +
+      "#" +
       (
         ((cos(r) * 127 + 128) << 16) |
         ((cos(r + pi / 3) * 127 + 128) << 8) |
         (cos(r + (pi / 3) * 2) * 127 + 128)
-      ).toString(16)
-    g2d.fill()
-    q[0] = q[1]
-    q[1] = { x: k, y: n }
+      ).toString(16);
+    g2d.fill();
+    q[0] = q[1];
+    q[1] = {
+      x: k,
+      y: n
+    };
   }
-  function line (p) {
-    t = p + (random() * 2 - 1.1) * f
-    return t > height || t < 0 ? line(p) : t
+
+  function line(p) {
+    t = p + (random() * 2 - 1.1) * f;
+    return t > height || t < 0 ? line(p) : t;
   }
-  if (config.c !== 'false') {
-    document.onclick = redraw
-    document.ontouchstart = redraw
+  if (config.c !== "false") {
+    document.onclick = redraw;
+    document.ontouchstart = redraw;
   }
-  redraw()
-})()
+  redraw();
+})();

source/js/utils.js

@@ -48,10 +48,10 @@ function throttle (func, wait, options) {
   return throttled
 }
 
-function sidebarPaddingR() {
-  let innerWidth = window.innerWidth
-  let clientWidth = document.body.clientWidth
-  let paddingRight = innerWidth - clientWidth
+function sidebarPaddingR () {
+  var innerWidth = window.innerWidth
+  var clientWidth = document.body.clientWidth
+  var paddingRight = innerWidth - clientWidth
   if (innerWidth !== clientWidth) {
     $('body').css('padding-right', paddingRight)
   }
@@ -59,7 +59,7 @@ function sidebarPaddingR() {
 
 // iPadOS
 function isIpad () {
-  return navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 
+  return navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1
 }
 
 function isTMobile () {