The Unified and Autonomous Development Platform
Fix some minor issues
robin shenee6da5f0d28d
diff --git a/core/pom.xml b/core/pom.xmlindex ddabd8c2b1..6a6e96532e 100644--- a/core/pom.xml+++ b/core/pom.xml@@ -202,6 +202,11 @@<artifactId>flexmark-ext-autolink</artifactId><version>${flexmark.version}</version></dependency>+ <dependency>+ <groupId>com.vladsch.flexmark</groupId>+ <artifactId>flexmark-ext-anchorlink</artifactId>+ <version>${flexmark.version}</version>+ </dependency><dependency><groupId>com.vladsch.flexmark</groupId><artifactId>flexmark-ext-definition</artifactId>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.javaindex 9ba0f4d7ee..5d399db69b 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@@ -23,6 +23,7 @@ import com.gitplex.server.util.markdown.UrlResolveExtension;import com.google.common.base.Preconditions;import com.vladsch.flexmark.Extension;import com.vladsch.flexmark.ast.Node;+import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension;import com.vladsch.flexmark.ext.autolink.AutolinkExtension;import com.vladsch.flexmark.ext.definition.DefinitionExtension;import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;@@ -94,6 +95,7 @@ public class DefaultMarkdownManager implements MarkdownManager {Preconditions.checkArgument(baseUrl == null || baseUrl.startsWith("/"));List<Extension> extensions = new ArrayList<>();+ extensions.add(AnchorLinkExtension.create());extensions.add(TablesExtension.create());extensions.add(TaskListExtension.create());extensions.add(DefinitionExtension.create());@@ -102,9 +104,15 @@ public class DefaultMarkdownManager implements MarkdownManager {extensions.add(new UrlResolveExtension());extensions.addAll(contributedExtensions);- MutableDataHolder options = new MutableDataSet();- options.set(Parser.SPACE_IN_LINK_URLS, true).setFrom(ParserEmulationProfile.GITHUB_DOC)- .set(TablesExtension.COLUMN_SPANS, false).set(TablesExtension.APPEND_MISSING_COLUMNS, true)+ 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(Parser.SPACE_IN_LINK_URLS, true)+ .setFrom(ParserEmulationProfile.GITHUB_DOC)+ .set(TablesExtension.COLUMN_SPANS, false)+ .set(TablesExtension.APPEND_MISSING_COLUMNS, true).set(TablesExtension.DISCARD_EXTRA_COLUMNS, true).set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true).set(UrlResolveExtension.BASE_URL, baseUrl)diff --git a/core/src/main/java/com/gitplex/server/util/jetty/DefaultJettyRunner.java b/core/src/main/java/com/gitplex/server/util/jetty/DefaultJettyRunner.javaindex 6252094753..7d799ca4e3 100644--- a/core/src/main/java/com/gitplex/server/util/jetty/DefaultJettyRunner.java+++ b/core/src/main/java/com/gitplex/server/util/jetty/DefaultJettyRunner.java@@ -62,6 +62,8 @@ public class DefaultJettyRunner implements JettyRunner, Provider<ServletContextHservletContextHandler.setErrorHandler(new ErrorPageErrorHandler());servletContextHandler.addFilter(DisableTraceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));+ servletContextHandler.getSessionHandler().getSessionManager().setSessionIdPathParameterName(null);+/** By default contributions is in reverse dependency order. We reverse the order so that* servlet and filter contributions in dependency plugins comes first.diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/SourcePositionTrackExtension.java b/web/src/main/java/com/gitplex/server/web/component/markdown/SourcePositionTrackExtension.javaindex 6163e01fb4..ef8c875052 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/SourcePositionTrackExtension.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/SourcePositionTrackExtension.java@@ -35,24 +35,26 @@ public class SourcePositionTrackExtension implements HtmlRenderer.HtmlRendererExint startOffset = node.getStartOffset();int endOffset = node.getEndOffset();Node document = node.getDocument();- int leadingWhitespaces = 0;- for (int i=startOffset; i<endOffset; i++) {- if (Character.isWhitespace(document.getChars().charAt(i))) {- leadingWhitespaces++;- } else {- break;+ if (document != null) {+ int leadingWhitespaces = 0;+ for (int i=startOffset; i<endOffset; i++) {+ if (Character.isWhitespace(document.getChars().charAt(i))) {+ leadingWhitespaces++;+ } else {+ break;+ }}- }- int trailingWhitespaces = 0;- for (int i=endOffset-1; i>=startOffset; i--) {- if (Character.isWhitespace(document.getChars().charAt(i))) {- trailingWhitespaces++;- } else {- break;+ int trailingWhitespaces = 0;+ for (int i=endOffset-1; i>=startOffset; i--) {+ if (Character.isWhitespace(document.getChars().charAt(i))) {+ trailingWhitespaces++;+ } else {+ break;+ }}+ attributes.addValue("data-" + DATA_START_ATTRIBUTE, String.valueOf(startOffset+leadingWhitespaces));+ attributes.addValue("data-" + DATA_END_ATTRIBUTE, String.valueOf(endOffset-trailingWhitespaces));}- attributes.addValue("data-" + DATA_START_ATTRIBUTE, String.valueOf(startOffset+leadingWhitespaces));- attributes.addValue("data-" + DATA_END_ATTRIBUTE, String.valueOf(endOffset-trailingWhitespaces));}}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.cssindex 820d0e0470..fb7ee2a173 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@@ -261,33 +261,33 @@.markdown-rendered .task-list-item input {margin-right: 8px;}-.markdown-rendered .permalinked a.permalink {+.markdown-rendered .header-anchor>i {display: none;}-.markdown-rendered .permalinked:hover a.permalink {+.markdown-rendered .header-anchor:hover>i {display: inline;}-.markdown-rendered h1.permalinked a.permalink {+.markdown-rendered h1 .header-anchor>i {margin-left: 12px;font-size: 24px;}-.markdown-rendered h2.permalinked a.permalink {+.markdown-rendered h2 .header-anchor>i {margin-left: 10px;font-size: 20px;}-.markdown-rendered h3.permalinked a.permalink {+.markdown-rendered h3 .header-anchor>i {margin-left: 8px;font-size: 16px;}-.markdown-rendered h4.permalinked a.permalink {+.markdown-rendered h4 .header-anchor>i {margin-left: 6px;font-size: 14px;}-.markdown-rendered h5.permalinked a.permalink {+.markdown-rendered h5 .header-anchor>i {margin-left: 4px;font-size: 12px;}-.markdown-rendered h6.permalinked a.permalink {+.markdown-rendered h6 .header-anchor>i {margin-left: 2px;font-size: 10px;}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.jsindex 99582f2b0b..0d99652885 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@@ -841,20 +841,6 @@ gitplex.server.markdown = {initRendered: function($rendered) {gitplex.server.highlight($rendered);- $rendered.find("h1, h2, h3, h4, h5, h6").each(function() {- var $this = $(this);- var $anchor = $this.find(">a[name]");- if ($anchor.length != 0) {- $this.addClass("permalinked").append($anchor.html());- $anchor.empty();- $this.append("<a href='#" + $anchor.attr("name") + "' class='permalink'><i class='fa fa-link'></i></a>");- } else {- var anchorName = encodeURIComponent($this.text());- $this.addClass("permalinked").prepend("<a name='" + anchorName + "'></a>");- $this.append("<a href='#" + anchorName + "' class='permalink'><i class='fa fa-link'></i></a>");- }- });-$rendered.find("a").click(function() {gitplex.server.viewState.getFromViewAndSetToHistory();});@@ -916,7 +902,9 @@ gitplex.server.markdown = {if (isImage)message = "!" + message;- gitplex.server.markdown.updateUploadMessage($input, message, replaceMessage);+ // Use range instead of caret here to avoid scrolling to bottom in Chrome+ $input.range(message);+if (!name) {var offset = isImage?2:1;$input.range($input.caret()-message.length+offset, $input.caret()-message.length+defaultDescription.length+offset);diff --git a/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.javaindex 68f2f34d32..999db49379 100644--- a/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java+++ b/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java@@ -229,22 +229,25 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessorsession = oldSession;}- IPageManager pageManager = session.getPageManager();- Page page = getPage(pageManager);+ // Session is null if we copy the url with jsessionid to a new browser window+ if (session != null) {+ IPageManager pageManager = session.getPageManager();+ Page page = getPage(pageManager);- WebSocketRequestHandler requestHandler = webSocketSettings.newWebSocketRequestHandler(page, connection);+ WebSocketRequestHandler requestHandler = webSocketSettings.newWebSocketRequestHandler(page, connection);- @SuppressWarnings("rawtypes")- WebSocketPayload payload = createEventPayload(message, requestHandler);+ @SuppressWarnings("rawtypes")+ WebSocketPayload payload = createEventPayload(message, requestHandler);- if (!(message instanceof ConnectedMessage || message instanceof ClosedMessage))- {- requestCycle.scheduleRequestHandlerAfterCurrent(requestHandler);- }+ if (!(message instanceof ConnectedMessage || message instanceof ClosedMessage))+ {+ requestCycle.scheduleRequestHandlerAfterCurrent(requestHandler);+ }- IRequestHandler broadcastingHandler = new WebSocketMessageBroadcastHandler(pageId, resourceName, payload);- requestMapper.setHandler(broadcastingHandler);- requestCycle.processRequestAndDetach();+ IRequestHandler broadcastingHandler = new WebSocketMessageBroadcastHandler(pageId, resourceName, payload);+ requestMapper.setHandler(broadcastingHandler);+ requestCycle.processRequestAndDetach();+ }}catch (Exception x){