Merge pull request #519 from chengzhongxue/main

解决首页瞬间滚动数据显示问题

templates/assets/js/halo.js

@@ -270,9 +270,6 @@ let halo = {
             e.batchSend(t, !0);
         else {
             let n = [];
-            function a(e) {
-                return e = (e = (e = (e = (e = e.replace(/<\/*br>|[\s\uFEFF\xA0]+/g, "")).replace(/<img.*?>/g, "[图片]")).replace(/<a.*?>.*?<\/a>/g, "[链接]")).replace(/<pre.*?>.*?<\/pre>/g, "[代码块]")).replace(/<.*?>/g, "")
-            }
             if(GLOBAL_CONFIG.source.comments.use == 'Twikoo'){
                 fetch(GLOBAL_CONFIG.source.twikoo.twikooUrl, {
                     method: "POST",
@@ -290,7 +287,7 @@ let halo = {
                                 null == e.avatar && (e.avatar = "https://cravatar.cn/avatar/d615d5793929e8c7d70eab5f00f7f5f1?d=mp"),
                                     n.push({
                                         avatar: e.avatar,
-                                        content: e.nick + "：" + a(e.comment),
+                                        content: e.nick + "：" + btf.changeContent(e.comment),
                                         href: e.url + '#' + e.id
 
                                     })
@@ -319,7 +316,7 @@ let halo = {
                         t.forEach((e=>{
                                 n.push({
                                     avatar: 'https://cravatar.cn/avatar/' + e.email_encrypted + '?d=mp&s=240',
-                                    content: e.nick + "：" + a(e.content_marked),
+                                    content: e.nick + "：" + btf.changeContent(e.content_marked),
                                     href: e.page_url + '#atk-comment-' + e.id
 
                                 })
@@ -338,7 +335,7 @@ let halo = {
                     }).then(({ comments }) => {
                         const walineArray = comments.map(e => {
                             return {
-                                'content': e.nick + "：" + a(e.comment),
+                                'content': e.nick + "：" + btf.changeContent(e.comment),
                                 'avatar': e.avatar,
                                 'href': e.url + '#' + e.objectId,
                             }

templates/assets/js/heo.js

@@ -22,6 +22,12 @@ var heo = {
     // 首页bb
     initIndexEssay: function() {
         if (document.querySelector("#bber-talk"))
+            $(".swiper-wrapper .swiper-slide").each(function () {
+                var text = $(this)[0].innerText;
+                if (text != 'undefined') {
+                    $(this).text(btf.changeContent(text));
+                }
+            })
             new Swiper(".swiper-container",{
                 direction: "vertical",
                 loop: !0,

templates/assets/js/utils.js

@@ -331,6 +331,23 @@ var btf = {
         }
 
         return actualTop
+    },
+    //过滤标签
+    changeContent: (content,length = null)=>{
+        if (content === '') return content
+
+        content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[图片]') // replace image link
+        content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[链接]') // replace url
+        content = content.replace(/<pre><code>.*?<\/pre>/gi, '[代码]') // replace code
+        content = content.replace(/<[^>]+>/g, "") // remove html tag
+
+        if (length!=null){
+            if (content.length > length) {
+                content = content.substring(0, length) + '...'
+            }
+        }
+
+        return content
     }
 
 }

templates/modules/comment/Artalk.html

@@ -10,19 +10,6 @@
     <!-- 最近评论 -->
     <script>
         window.addEventListener('load', () => {
-            const changeContent = (content) => {
-                if (content === '') return content
-
-                content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[图片]') // replace image link
-                content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[链接]') // replace url
-                content = content.replace(/<pre><code>.*?<\/pre>/gi, '[代码]') // replace code
-                content = content.replace(/<[^>]+>/g, "") // remove html tag
-
-                if (content.length > 150) {
-                    content = content.substring(0, 150) + '...'
-                }
-                return content
-            }
             const generateHtml = array => {
                 let result = ''
 
@@ -126,7 +113,7 @@
                         const artalk = d.data.map(function (e) {
                             return {
                                 'avatar': 'https://cravatar.cn/avatar/' + e.email_encrypted + '?d=mp&s=240',
-                                'content': changeContent(e.content_marked),
+                                'content': btf.changeContent(e.content_marked,150),
                                 'nick': e.nick,
                                 'url': e.page_url + '#atk-comment-' + e.id,
                                 'date': e.date,

templates/modules/comment/Twikoo.html

@@ -9,20 +9,6 @@ not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
     <!-- 最近评论 -->
     <script>
         window.addEventListener('load', () => {
-            const changeContent = (content) => {
-                if (content === '') return content
-
-                content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[图片]') // replace image link
-                content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[链接]') // replace url
-                content = content.replace(/<pre><code>.*?<\/pre>/gi, '[代码]') // replace code
-                content = content.replace(/<[^>]+>/g, "") // remove html tag
-
-                if (content.length > 150) {
-                    content = content.substring(0, 150) + '...'
-                }
-                return content
-            }
-
             const getComment = () => {
                 const runTwikoo = () => {
                     twikoo.getRecentComments({
@@ -33,7 +19,7 @@ not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
                     }).then(function (res) {
                         const twikooArray = res.map(e => {
                             return {
-                                'content': changeContent(e.comment),
+                                'content': btf.changeContent(e.comment,150),
                                 'avatar': e.avatar,
                                 'nick': e.nick,
                                 'url': e.url + '#' + e.id,

templates/modules/comment/Waline.html

@@ -8,20 +8,6 @@
     </div>
     <script>
         window.addEventListener('load', () => {
-            const changeContent = (content) => {
-                if (content === '') return content
-
-                content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[图片]') // replace image link
-                content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[链接]') // replace url
-                content = content.replace(/<pre><code>.*?<\/pre>/gi, '[代码]') // replace code
-                content = content.replace(/<[^>]+>/g, "") // remove html tag
-
-                if (content.length > 150) {
-                    content = content.substring(0, 150) + '...'
-                }
-                return content
-            }
-
             const generateHtml = array => {
                 let result = ''
 
@@ -63,7 +49,7 @@
                     }).then(({ comments }) => {
                         const walineArray = comments.map(e => {
                             return {
-                                'content': changeContent(e.comment),
+                                'content': btf.changeContent(e.comment,150),
                                 'avatar': e.avatar,
                                 'nick': e.nick,
                                 'url': e.url + '#' + e.objectId,

templates/modules/head.html

@@ -14,8 +14,6 @@
 
     <script th:src="${assets_link + '/js/heo.js' + theme_version}"></script>
 
-    <script th:src="${assets_link + '/js/halo.js' + theme_version}"></script>
-
     <link rel="stylesheet" th:href="${assets_link + '/zhheo/zhheoblog.css' + theme_version}">
 
     <link rel="stylesheet" th:href="${assets_link + '/zhheo/custom.css' + theme_version}">

templates/modules/layouts/layout.html

@@ -56,6 +56,7 @@
 
 <div>
     <script th:src="${assets_link + '/js/utils.js' + theme_version}"></script>
+    <script th:src="${assets_link + '/js/halo.js' + theme_version}"></script>
     <script th:src="${assets_link + '/js/main.js' + theme_version}"></script>
     <script charset="utf-8" data-pjax th:src="${assets_link + '/zhheo/blogex.js' + theme_version}"></script>
     <script th:src="${assets_link + '/js/tw_cn.js' + theme_version}"></script>