Skip to content

The Unified and Autonomous Development Platform

fix: Improve anchor retrieval in ReferenceInputBehavior and enhance widget escape handling

Robin Shen45ea346a4a02
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
index 8df0006b12..ea8c23dd83 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
@@ -74,7 +74,16 @@ public abstract class ReferenceInputBehavior extends InputAssistBehavior {
@Override
protected int getAnchor(String inputContent) {
- return inputContent.lastIndexOf('#');
+ Matcher matcher = REFERENCE_PATTERN.matcher(inputContent);
+ if (matcher.find()) {
+ String query = matcher.group("query");
+ int triggerIndex = query.lastIndexOf('#');
+ if (triggerIndex == -1)
+ triggerIndex = query.indexOf('-');
+ return matcher.start("query") + triggerIndex;
+ } else {
+ return inputContent.lastIndexOf('#');
+ }
}
protected abstract Project getProject();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index 518886378f..4380174bc2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -636,6 +636,7 @@ onedev.server = {
isEscapeConsumedByWidget: function() {
return $(".select2-drop:visible").length != 0
|| $(".dropdown.open").length != 0
+ || $("body>.floating").length != 0
|| $(".pcr-app.visible").length != 0
|| $(".atwho-view:visible").length != 0
|| $(".CodeMirror-hints:visible").length != 0