Skip to content

The Unified and Autonomous Development Platform

Process anchor links correctly if markdown headers contains links

robin shened6a77c6b65b
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
index 5d399db69b..bd044d39c8 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
@@ -107,8 +107,8 @@ public class DefaultMarkdownManager implements MarkdownManager {
MutableDataHolder options = new MutableDataSet()
.set(HtmlRenderer.GENERATE_HEADER_ID, true)
.set(AnchorLinkExtension.ANCHORLINKS_SET_NAME, true)
- .set(AnchorLinkExtension.ANCHORLINKS_ANCHOR_CLASS, "header-anchor")
- .set(AnchorLinkExtension.ANCHORLINKS_TEXT_SUFFIX, "<i class='fa fa-link'></i>")
+ .set(AnchorLinkExtension.ANCHORLINKS_WRAP_TEXT, false)
+ .set(AnchorLinkExtension.ANCHORLINKS_TEXT_SUFFIX, "<i class='header-anchor fa fa-link'></i>")
.set(Parser.SPACE_IN_LINK_URLS, true)
.setFrom(ParserEmulationProfile.GITHUB_DOC)
.set(TablesExtension.COLUMN_SPANS, false)
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css
index 87eb161a50..b37eab5063 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css
@@ -47,8 +47,6 @@
}
.code-comments td.comment>div>.content {
margin-left: 30px;
- color: #666;
- font-size: 13px;
}
.code-comments td.comment>div>.last-event {
color: #888;
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
index 2f49c0a883..2c54c4fa8c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
@@ -260,11 +260,6 @@ body.fullscreen {
.markdown-rendered h4, .markdown-rendered h5, .markdown-rendered h6 {
font-weight: bold;
}
-.markdown-rendered h1 a, .markdown-rendered h2 a, .markdown-rendered h3 a,
-.markdown-rendered h4 a, .markdown-rendered h5 a, .markdown-rendered h6 a {
- color: #333;
- text-decoration: none;
-}
.markdown-rendered blockquote {
font-size: 15px;
border-left: 4px solid #ddd;
@@ -285,34 +280,44 @@ body.fullscreen {
.markdown-rendered .task-list-item input {
margin-right: 8px;
}
-.markdown-rendered .header-anchor>i {
+.markdown-rendered .header-anchor {
display: none;
-}
-.markdown-rendered .header-anchor:hover>i {
+ position: relative;
+}
+.markdown-rendered h1:hover .header-anchor,
+.markdown-rendered h2:hover .header-anchor,
+.markdown-rendered h3:hover .header-anchor,
+.markdown-rendered h4:hover .header-anchor,
+.markdown-rendered h5:hover .header-anchor,
+.markdown-rendered h6:hover .header-anchor {
display: inline;
}
-.markdown-rendered h1 .header-anchor>i {
+.markdown-rendered h1 .header-anchor {
margin-left: 12px;
- font-size: 24px;
+ font-size: 22px;
}
-.markdown-rendered h2 .header-anchor>i {
+.markdown-rendered h2 .header-anchor {
margin-left: 10px;
font-size: 20px;
}
-.markdown-rendered h3 .header-anchor>i {
- margin-left: 8px;
- font-size: 16px;
+.markdown-rendered h3 .header-anchor {
+ margin-left: 10px;
+ font-size: 20px;
}
-.markdown-rendered h4 .header-anchor>i {
- margin-left: 6px;
+.markdown-rendered h4 .header-anchor {
+ margin-left: 10px;
font-size: 14px;
}
-.markdown-rendered h5 .header-anchor>i {
+.markdown-rendered h5 .header-anchor {
+ margin-left: 4px;
+ font-size: 12px;
+}
+.markdown-rendered h6 .header-anchor {
margin-left: 4px;
font-size: 12px;
}
-.markdown-rendered h6 .header-anchor>i {
- margin-left: 2px;
- font-size: 10px;
+.markdown-rendered a.header-anchor {
+ color: #333;
+ text-decoration: none;
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
index 4e3c5577b4..98d1ce9b47 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
@@ -804,6 +804,12 @@ gitplex.server.markdown = {
initRendered: function($rendered) {
gitplex.server.highlight($rendered);
+ $rendered.find(".header-anchor").each(function() {
+ var $headerAnchor = $(this).parent();
+ $headerAnchor.addClass("header-anchor");
+ $headerAnchor.closest("h1, h2, h3, h4, h5, h6").append($headerAnchor);
+ });
+
$rendered.find("a").click(function() {
gitplex.server.viewState.getFromViewAndSetToHistory();
});