фиксы игнора и показа веток

maxcom · Feb 27, 2024 · ea802ca · ea802ca
1 parent 2b46e73
commit ea802ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/webapp/WEB-INF/jsp/view-topic.jsp b/src/main/webapp/WEB-INF/jsp/view-topic.jsp
@@ -5,7 +5,7 @@
 <%@ taglib prefix="l" uri="http://www.linux.org.ru" %>
 <%@ taglib tagdir="/WEB-INF/tags" prefix="lor" %>
 <%--
-  ~ Copyright 1998-2023 Linux.org.ru
+  ~ Copyright 1998-2024 Linux.org.ru
   ~    Licensed under the Apache License, Version 2.0 (the "License");
   ~    you may not use this file except in compliance with the License.
   ~    You may obtain a copy of the License at
@@ -303,7 +303,7 @@
 
 <c:if test="${threadMode}">
   <div class=nav>
-    Показаны ответы на комментарий. <a href="${message.link}?cid=${threadRoot}">Показать</a> все комментарии.
+    Показаны ответы на комментарий. <a href="${message.link}">Показать</a> все комментарии.
   </div>
 </c:if>
 

diff --git a/src/main/webapp/js/lor.js b/src/main/webapp/js/lor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2023 Linux.org.ru
+ * Copyright 1998-2024 Linux.org.ru
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
  *    You may obtain a copy of the License at
@@ -387,7 +387,7 @@ $(document).ready(function() {
   function initSamepageCommentNavigation() {
     $("article.msg a[data-samepage=true]").click(function(event) {
       event.preventDefault();
-      location.hash = "comment-" + this.search.substr(5);
+      location.hash = "comment-" + this.search.match(/cid=(\d+)/)[1];
     })
   }