This commit is contained in:
Robin Shen 2024-11-20 14:27:01 +08:00
commit 8d0aa97bb0
65 changed files with 84 additions and 74 deletions

View File

@ -9,7 +9,7 @@
<version>1.2.3</version>
</parent>
<artifactId>server</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<build>
<plugins>

View File

@ -64,6 +64,7 @@ import java.util.*;
import static io.onedev.server.codequality.BlobTarget.groupByLine;
import static io.onedev.server.util.diff.DiffRenderer.toHtml;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import static org.unbescape.javascript.JavaScriptEscape.escapeJavaScript;
@SuppressWarnings("serial")
public class BlobTextDiffPanel extends Panel {
@ -259,7 +260,7 @@ public class BlobTextDiffPanel extends Panel {
String expanded = StringUtils.replace(builder.toString(), "\n", "");
String script = String.format("onedev.server.blobTextDiff.expand('%s', %d, \"%s\");",
getMarkupId(), index, JavaScriptEscape.escapeJavaScript(expanded));
getMarkupId(), index, escapeJavaScript(expanded));
target.appendJavaScript(script);
break;
case "openSelectionPopover":
@ -272,7 +273,7 @@ public class BlobTextDiffPanel extends Panel {
if (getAnnotationSupport() != null) {
markUrl = getAnnotationSupport().getMarkUrl(commentRange);
if (markUrl != null)
markUrl = "'" + JavaScriptEscape.escapeJavaScript(markUrl) + "'";
markUrl = "'" + escapeJavaScript(markUrl) + "'";
else
markUrl = "undefined";
} else {
@ -280,7 +281,7 @@ public class BlobTextDiffPanel extends Panel {
}
script = String.format("onedev.server.blobTextDiff.openSelectionPopover('%s', %s, %s, %s, '%s', %s);",
getMarkupId(), jsonOfPosition, convertToJson(commentRange), markUrl,
JavaScriptEscape.escapeJavaScript(getMarkedText(commentRange)),
escapeJavaScript(getMarkedText(commentRange)),
SecurityUtils.getAuthUser()!=null);
target.appendJavaScript(script);
break;
@ -347,10 +348,12 @@ public class BlobTextDiffPanel extends Panel {
add(symbolTooltip);
add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
return blameInfo!=null? "blob-text-diff need-width": "blob-text-diff";
}
}));
setOutputMarkupId(true);
}
@ -398,8 +401,12 @@ public class BlobTextDiffPanel extends Panel {
explicit("param3"), explicit("param4"), explicit("param5"),
explicit("param6"), explicit("param7"), explicit("param8"));
String script = String.format("onedev.server.blobTextDiff.onDomReady('%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s);", getMarkupId(), symbolTooltip.getMarkupId(),
change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,
String script = String.format("onedev.server.blobTextDiff.onDomReady('%s', '%s', '%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s);",
getMarkupId(), symbolTooltip.getMarkupId(),
change.getOldBlobIdent().revision,
change.getNewBlobIdent().revision,
change.getOldBlobIdent().path!=null? escapeJavaScript(change.getOldBlobIdent().path):"",
change.getNewBlobIdent().path!=null? escapeJavaScript(change.getNewBlobIdent().path):"",
callback, blameMessageBehavior.getCallback(),
convertToJson(markRange), convertToJson(openCommentInfo),
convertToJson(annotationInfoModel.getObject()),

View File

@ -1,10 +1,13 @@
onedev.server.blobTextDiff = {
symbolClasses: ".cm-property, .cm-variable, .cm-variable-2, .cm-variable-3, .cm-def, .cm-meta, .cm-string, .cm-tag, .cm-attribute, cm-builtin, cm-qualifier",
onDomReady: function(containerId, symbolTooltipId, oldRev, newRev, callback, blameMessageCallback,
markRange, openComment, annotationInfo, commentContainerId) {
onDomReady: function(containerId, symbolTooltipId, oldRev, newRev, oldPath, newPath,
callback, blameMessageCallback, markRange, openComment,
annotationInfo, commentContainerId) {
var $container = $("#" + containerId);
$container.data("commentContainerId", commentContainerId);
$container.data("callback", callback);
$container.data("oldPath", oldPath);
$container.data("newPath", newPath);
$container.data("blameMessageCallback", blameMessageCallback);
$container.data("symbolHover", function() {
var revision;
@ -487,8 +490,8 @@ onedev.server.blobTextDiff = {
if (!$scrollParent.data("onTextDiffScrollInstalled")) {
$scrollParent.data("onTextDiffScrollInstalled", true);
$scrollParent.doneEvents("scroll", function() {
$(".text-diff").each(function() {
onedev.server.blobTextDiff.highlightSyntax($(this).parent());
$(".blob-text-diff").each(function() {
onedev.server.blobTextDiff.highlightSyntax($(this));
}, 100);
});
}
@ -496,8 +499,8 @@ onedev.server.blobTextDiff = {
onedev.server.blobTextDiff.highlightSyntax($container);
},
highlightSyntax($container) {
var oldBlobPath = $container.find(".diff-title>span:first-child").text();
var newBlobPath = $container.find(".diff-title>span:last-child").text();
var oldBlobPath = $container.data("oldPath");
var newBlobPath = $container.data("newPath");
$container.find("tbody, tr.expander").each(function() {
var $this = $(this);

View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<build>
<resources>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.bazel.BazelModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mailservice.gmail.GmailModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mailservice.office365.Office365Module</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mailservice.smtpimap.SmtpImapModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.ntfy.NtfyModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.html.HtmlModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>

View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>11.5.1</version>
<version>11.5.2</version>
</parent>
<dependencies>
<dependency>