Skip to content

The Unified and Autonomous Development Platform

fix issue: @mention does not work in markdown

Robin Shen9b085315a86b
diff --git a/core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java b/core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java
index 9726116e87..07617f8bde 100644
--- a/core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java
@@ -15,7 +15,7 @@ public class AtWhoResourceReference extends JavaScriptResourceReference {
private static final long serialVersionUID = 1L;
public AtWhoResourceReference() {
- super(AtWhoResourceReference.class, "jquery.atwho.patched.js");
+ super(AtWhoResourceReference.class, "jquery.atwho.js");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.patched.js b/core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js
similarity index 99%
rename from core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.patched.js
rename to core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js
index cb9a12c1bd..03e41359df 100644
--- a/core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.patched.js
+++ b/core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js
@@ -348,9 +348,6 @@ Controller = (function() {
var data, tpl;
tpl = this.getOpt('insertTpl');
- // patched to support to use function as insert template
- if (typeof tpl !== "string")
- tpl = tpl();
data = $.extend({}, $li.data('item-data'), {
'atwho-at': this.at
});
@@ -942,10 +939,6 @@ View = (function() {
$ul = this.$el.find('ul');
tpl = this.context.getOpt('displayTpl');
- // patched to support to use function as display template
- if (typeof tpl !== "string")
- tpl = tpl();
-
for (i = 0, len = list.length; i < len; i++) {
item = list[i];
item = $.extend({}, item, {
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index ae1e8a2668..05ca4c69b2 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -578,18 +578,6 @@ onedev.server.markdown = {
var input = $input.val().substring(0, $input.caret()).toLowerCase().replace(/\s/g,'').trim();
return input.endsWith("issue#");
}
- function getInsertTemplate() {
- if (isReferencingPullRequest() || isReferencingIssue())
- return "#${referenceNumber}";
- else
- return '${referenceType} #${referenceNumber}';
- }
- function getDisplayTemplate() {
- if (isReferencingPullRequest() || isReferencingIssue())
- return "<li><span class='text-muted'>#${referenceNumber}</span> - ${referenceTitle}</li>";
- else
- return "<li><span class='text-muted'>${referenceType} #${referenceNumber}</span> - ${referenceTitle}</li>";
- }
$input.atwho({
at: '#',
@@ -607,8 +595,18 @@ onedev.server.markdown = {
callback("referenceQuery", query, queryType);
}
},
- displayTpl: getDisplayTemplate,
- insertTpl: getInsertTemplate,
+ displayTpl: function() {
+ if (isReferencingPullRequest() || isReferencingIssue())
+ return "<li><span class='text-muted'>#${referenceNumber}</span> - ${referenceTitle}</li>";
+ else
+ return "<li><span class='text-muted'>${referenceType} #${referenceNumber}</span> - ${referenceTitle}</li>";
+ },
+ insertTpl: function() {
+ if (isReferencingPullRequest() || isReferencingIssue())
+ return "#${referenceNumber}";
+ else
+ return '${referenceType} #${referenceNumber}';
+ },
limit: atWhoLimit
});
}