github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 19:29:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Show autocomplete when enable_inline_emoji_translation is true.

Browse Source
This commit is contained in:
Bianca Nenciu
2018-11-26 16:27:45 +02:00
committed by Régis Hanol
parent e9bbdef156
commit 79d987e483
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/components/d-editor.js.es6
View File

@ -410,9 +410,11 @@ export default Ember.Component.extend({
},
onKeyUp(text, cp) {
const matches = /(?:^|[^a-z])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi.exec(
text.substring(0, cp)
);
const regex = self.siteSettings.enable_inline_emoji_translation
? /(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi
: /(?:^|[^a-z])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi;
const matches = regex.exec(text.substring(0, cp));
if (matches && matches[1]) {
return [matches[1]];

2
test/javascripts/lib/pretty-text-test.js.es6
View File

@ -1364,7 +1364,7 @@ QUnit.test("emoji - enable_inline_emoji_translation", assert => {
assert.cookedOptions(
"test:smile:test",
{ siteSettings: { enable_inline_emoji_translation: true } },
`<p>test<img src="/images/emoji/twitter/smile.png?v=${v}" title=":smile:" class="emoji" alt=":smile:">test</p>`
`<p>test<img src="/images/emoji/emoji_one/smile.png?v=${v}" title=":smile:" class="emoji" alt=":smile:">test</p>`
);
});