Merge pull request #1822 from Even-lwx/fix/native-lazyload-self-closing-images

fix: preserve self-closing images in native lazyload

_config.yml

@@ -427,7 +427,6 @@ copy:
     enable: false
     limit_count: 150
 
-# Need to install the hexo-wordcount plugin
 wordcount:
   enable: false
   # Display the word count of the article in post meta
@@ -652,6 +651,7 @@ artalk:
   site:
   # Use Artalk visitor count as the page view count
   visitor: false
+  vote: false
   option:
 
 # --------------------------------------
@@ -659,7 +659,7 @@ artalk:
 # --------------------------------------
 
 chat:
-  # Choose: chatra/tidio/crisp/knocket
+  # Choose: chatra/tidio/crisp/knocket
   # Leave it empty if you don't need chat
   use:
   # Chat Button [recommend]
@@ -680,10 +680,10 @@ tidio:
 crisp:
   website_id:
 
-# https://trtc.io/solutions/knocket
+# https://trtc.io/solutions/knocket
-knocket:
+knocket:
-  identifier:
+  identifier:
-
+
 # --------------------------------------
 # Analysis
 # --------------------------------------

layout/includes/header/post-info.pug

@@ -43,13 +43,13 @@
           if theme.wordcount.post_wordcount
             i.far.fa-file-word.fa-fw.post-meta-icon
             span.post-meta-label= _p('post.wordcount') + ':'
-            span.word-count= wordcount(page.content)
+            span.word-count= wordcount(page)
             if theme.wordcount.min2read
               span.post-meta-separator |
           if theme.wordcount.min2read
             i.far.fa-clock.fa-fw.post-meta-icon
             span.post-meta-label= _p('post.min2read') + ':'
-            span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
+            span= min2read(page) + ' ' + _p('post.min2read_unit')
 
       //- for pv and count
       mixin pvBlock(parent_id, parent_class, parent_title)

layout/includes/third-party/comments/waline.pug

@@ -20,8 +20,29 @@ script.
         path: isShuoshuo ? path : (option && option.path) || path
       })
 
+      let lightboxObserver = null
+      if (GLOBAL_CONFIG.lightbox !== 'null') {
+        const wrap = el.querySelector('#waline-wrap')
+        if (wrap) {
+          lightboxObserver = new MutationObserver(mutations => {
+            const imgs = []
+            mutations.forEach(mutation => {
+              mutation.addedNodes.forEach(node => {
+                if (node.nodeType !== 1) return
+                const nodeImgs = node.matches && node.matches('img') ? [node] : node.querySelectorAll('img')
+                nodeImgs.forEach(img => imgs.push(img))
+              })
+            })
+            const lightboxImgs = imgs.filter(img => img.closest('.wl-content') && !img.classList.contains('wl-emoji'))
+            if (lightboxImgs.length) btf.loadLightbox(lightboxImgs)
+          })
+          lightboxObserver.observe(wrap, { childList: true, subtree: true })
+        }
+      }
+
       if (isShuoshuo) {
         window.shuoshuoComment.destroyWaline = () => {
+          lightboxObserver && lightboxObserver.disconnect()
           destroyWaline(waline)
           if (el.children.length) {
             el.innerHTML = ''
@@ -46,7 +67,7 @@ script.
 
     if (isShuoshuo) {
       '!{use[0]}' === 'Waline'
-        ? window.shuoshuoComment = { loadComment: loadWaline } 
+        ? window.shuoshuoComment = { loadComment: loadWaline }
         : window.loadOtherComment = loadWaline
       return
     }