summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-07-25 00:51:30 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-07-25 00:51:30 +0900
commitf1bbbcfedf950d2bfd391834a19e6bfad530dd27 (patch)
tree358a510af710089014f9e470bcb56b6b8c71b724 /src/client
parentUpdate config template: Add missing property definition (diff)
downloadsharkey-f1bbbcfedf950d2bfd391834a19e6bfad530dd27.tar.gz
sharkey-f1bbbcfedf950d2bfd391834a19e6bfad530dd27.tar.bz2
sharkey-f1bbbcfedf950d2bfd391834a19e6bfad530dd27.zip
Fix #1960
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/directives/autocomplete.ts7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/client/app/common/views/directives/autocomplete.ts b/src/client/app/common/views/directives/autocomplete.ts
index bb97bc2887..10c37a06e7 100644
--- a/src/client/app/common/views/directives/autocomplete.ts
+++ b/src/client/app/common/views/directives/autocomplete.ts
@@ -1,5 +1,6 @@
import * as getCaretCoordinates from 'textarea-caret';
import MkAutocomplete from '../components/autocomplete.vue';
+import renderAcct from '../../../../../misc/acct/render';
export default {
bind(el, binding, vn) {
@@ -187,13 +188,15 @@ class Autocomplete {
const trimmedBefore = before.substring(0, before.lastIndexOf('@'));
const after = source.substr(caret);
+ const acct = renderAcct(value);
+
// 挿入
- this.text = trimmedBefore + '@' + value.username + ' ' + after;
+ this.text = trimmedBefore + '@' + acct + ' ' + after;
// キャレットを戻す
this.vm.$nextTick(() => {
this.textarea.focus();
- const pos = trimmedBefore.length + (value.username.length + 2);
+ const pos = trimmedBefore.length + (acct.length + 2);
this.textarea.setSelectionRange(pos, pos);
});
} else if (type == 'hashtag') {