Skip to content

The Unified and Autonomous Development Platform

fix: Cursor jumps to start of markdown when insert issue reference at last line (OD-2225)

Robin Shen963c04d2c0bd
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java
index 744d2ce5e3..d9dbbf8ae1 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java
@@ -30,7 +30,8 @@ public class SCPCommandStep extends CommandStep {
private String options;
- @Editable(order=200, description="Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as private key for SSH authentication")
+ @Editable(order=200, description="Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as private key for SSH authentication. " +
+ "<b class='text-warning'>WARNING:</b> Private key with passphrase is not supported")
@ChoiceProvider("getPrivateKeySecretChoices")
@NotEmpty
public String getPrivateKeySecret() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java
index 2ee729dce3..3d0d7c9b75 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java
@@ -56,7 +56,7 @@ public class SSHCommandStep extends CommandStep {
}
@Editable(order=200, description="Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as private key of above user " +
- "for SSH authentication")
+ "for SSH authentication. <b class='text-warning'>WARNING:</b> Private key with passphrase is not supported")
@ChoiceProvider("getPrivateKeySecretChoices")
@NotEmpty
public String getPrivateKeySecret() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index 0f43be7f0c..c21aa1f90f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -539,8 +539,15 @@ onedev.server.markdown = {
$input.focus();
var match = matchReference(atChar);
if (match) {
- $input.range(match.index, $input.caret());
- document.execCommand("insertText", false, "");
+ var content = $input.val();
+ if ($input.caret() != content.length) {
+ $input.range(match.index, $input.caret());
+ document.execCommand("insertText", false, "");
+ } else {
+ // Fix OD-2225
+ $input.val(content.substring(0, match.index));
+ $input.caret(content.length-1);
+ }
}
}
$input.atwho({