summaryrefslogtreecommitdiff
path: root/assets/js/components
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-12-03 12:56:12 -0500
committerFrederic Guillot <fred@kanboard.net>2016-12-03 12:56:12 -0500
commit23d862aef8891130bc7eaeaa25513a9895b44c95 (patch)
tree85331881d6d36e3e358e3b6eb02ec32cf451648e /assets/js/components
parent4b22db5400cc5b30696560cd4fc5e44ec845168c (diff)
Add suggest menu for task ID
Diffstat (limited to 'assets/js/components')
-rw-r--r--assets/js/components/suggest-menu.js11
-rw-r--r--assets/js/components/text-editor.js4
2 files changed, 9 insertions, 6 deletions
diff --git a/assets/js/components/suggest-menu.js b/assets/js/components/suggest-menu.js
index f1f44eaf..07539d2c 100644
--- a/assets/js/components/suggest-menu.js
+++ b/assets/js/components/suggest-menu.js
@@ -139,13 +139,16 @@ KB.component('suggest-menu', function(containerElement, options) {
return null;
}
- function fetchItems(trigger, text, value) {
- if (typeof value === 'string') {
- KB.http.get(value).success(function (response) {
+ function fetchItems(trigger, text, params) {
+ if (typeof params === 'string') {
+ var regex = new RegExp('SEARCH_TERM', 'g');
+ var url = params.replace(regex, text);
+
+ KB.http.get(url).success(function (response) {
onItemFetched(trigger, text, response);
});
} else {
- onItemFetched(trigger, text, value);
+ onItemFetched(trigger, text, params);
}
}
diff --git a/assets/js/components/text-editor.js b/assets/js/components/text-editor.js
index 45b12b01..57bc0f78 100644
--- a/assets/js/components/text-editor.js
+++ b/assets/js/components/text-editor.js
@@ -70,8 +70,8 @@ KB.component('text-editor', function (containerElement, options) {
textarea = textareaElement.build();
- if (options.mentionUrl) {
- KB.getComponent('suggest-menu', textarea, {triggers: {'@': options.mentionUrl}}).render();
+ if (options.suggestOptions) {
+ KB.getComponent('suggest-menu', textarea, options.suggestOptions).render();
}
return KB.dom('div')