移除 评论加载方式 配置项

settings.yaml

@@ -1350,16 +1350,6 @@ spec:
               label: 开启
             - value: false
               label: 关闭
-        - $formkit: radio
-          name: enable_comment_type
-          label: 评论加载方式
-          value: true
-          help: '在使用Halo评论组件时，建议您关闭Pjax加载功能以获得最佳体验。同时，Halo评论组件支持评论插件的新特性。而对于Web评论组件，它支持Pjax加载，但请注意，部分新特性可能不被Web评论组件所支持。'
-          options:
-            - value: true
-              label: Halo评论组件
-            - value: false
-              label: Web评论组件
         - $formkit: radio
           name: effects_lantern_mode
           id: effects_lantern_mode

templates/links.html

@@ -49,41 +49,19 @@
         </div>
         <div class="card card-content comment-wrapper-z-index" id="comment-wrapper" th:if="${enableComment}">
             <h3 class="comment-title">评论</h3>
-            <th:block th:unless="${theme.config.enhance.enable_comment_type}">
+            <th:block th:if="${theme.config.page_config.link_enable_comment == 'custom'}">
-                <th:block th:if="${theme.config.page_config.link_enable_comment == 'custom'}">
+                <halo:comment
-                    <comment-widget
+                        group="content.halo.run"
-                            group="content.halo.run"
+                        kind="SinglePage"
-                            kind="SinglePage"
+                        th:attr="name=${theme.config.page_config.link_comment_id}"
-                            version="v1alpha1"
+                />
-                            th:name="${theme.config.page_config.link_comment_id}"
-                            with-replies="false"
-                    ></comment-widget>
-                </th:block>
-                <th:block th:if="${theme.config.page_config.link_enable_comment != 'custom'}">
-                    <comment-widget
-                            group="plugin.halo.run"
-                            kind="Plugin"
-                            version="v1alpha1"
-                            th:name="${pluginName}"
-                            with-replies="false"
-                    ></comment-widget>
-                </th:block>
             </th:block>
-            <th:block th:if="${theme.config.enhance.enable_comment_type}">
+            <th:block th:if="${theme.config.page_config.link_enable_comment != 'custom'}">
-                <th:block th:if="${theme.config.page_config.link_enable_comment == 'custom'}">
+                <halo:comment
-                    <halo:comment
+                        group="plugin.halo.run"
-                            group="content.halo.run"
+                        kind="Plugin"
-                            kind="SinglePage"
+                        th:attr="name=${pluginName}"
-                            th:attr="name=${theme.config.page_config.link_comment_id}"
+                />
-                    />
-                </th:block>
-                <th:block th:if="${theme.config.page_config.link_enable_comment != 'custom'}">
-                    <halo:comment
-                            group="plugin.halo.run"
-                            kind="Plugin"
-                            th:attr="name=${pluginName}"
-                    />
-                </th:block>
             </th:block>
         </div>
     </th:block>

templates/main/article.html

@@ -98,21 +98,10 @@
 
     <div class="card card-content comment-wrapper-z-index" id="comment-wrapper" th:if="${enableComment}">
         <h3 class="comment-title">评论</h3>
-        <th:block th:unless="${theme.config.enhance.enable_comment_type}">
+        <halo:comment
-            <comment-widget
+                group="content.halo.run"
-                    group="content.halo.run"
+                th:kind="${type}"
-                    th:kind="${type}"
+                th:attr="name=${post.metadata.name}"
-                    version="v1alpha1"
+        />
-                    th:name="${post.metadata.name}"
-                    with-replies="false"
-            ></comment-widget>
-        </th:block>
-        <th:block th:if="${theme.config.enhance.enable_comment_type}">
-            <halo:comment
-                    group="content.halo.run"
-                    th:kind="${type}"
-                    th:attr="name=${post.metadata.name}"
-            />
-        </th:block>
     </div>
 </th:block>

templates/moment.html

@@ -57,22 +57,11 @@
         </div>
       </div>
       <div class="journal-comment comment-wrapper-z-index" th:if="${enableComment}">
-        <th:block th:unless="${theme.config.enhance.enable_comment_type}">
+        <halo:comment
-          <comment-widget
+                group="moment.halo.run"
-                  group="moment.halo.run"
+                kind="Moment"
-                  kind="Moment"
+                th:attr="name=${moment.metadata.name}"
-                  version="v1alpha1"
+        />
-                  th:name="${moment.metadata.name}"
-                  with-replies="false"
-          ></comment-widget>
-        </th:block>
-        <th:block th:if="${theme.config.enhance.enable_comment_type}">
-          <halo:comment
-                  group="moment.halo.run"
-                  kind="Moment"
-                  th:attr="name=${moment.metadata.name}"
-          />
-        </th:block>
       </div>
     </div>
 

templates/moments.html

@@ -68,22 +68,11 @@
         </div>
       </div>
       <div class="journal-comment comment-wrapper-z-index" th:if="${enableComment}">
-        <th:block th:unless="${theme.config.enhance.enable_comment_type}">
+        <halo:comment
-          <comment-widget
+                group="moment.halo.run"
-                  group="moment.halo.run"
+                kind="Moment"
-                  kind="Moment"
+                th:attr="name=${moment.metadata.name}"
-                  version="v1alpha1"
+        />
-                  th:name="${moment.metadata.name}"
-                  with-replies="false"
-          ></comment-widget>
-        </th:block>
-        <th:block th:if="${theme.config.enhance.enable_comment_type}">
-          <halo:comment
-                  group="moment.halo.run"
-                  kind="Moment"
-                  th:attr="name=${moment.metadata.name}"
-          />
-        </th:block>
       </div>
     </div>
     <th:block th:replace="~{main/pagination :: pagination (${moments}, '/moments')}"/>