github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 21:23:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: do not show emoji menu when : has a letter before

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-03-14 10:28:57 +01:00 committed by GitHub
parent c5fa452f00
commit d2a7a4916a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,7 +357,11 @@ export default Ember.Component.extend({
}, },
onKeyUp(text, cp) { onKeyUp(text, cp) {
return text.substring(0, cp).match(/(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/g); const matches = /(?:^|[^a-z])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi.exec(text.substring(0, cp));
if (matches && matches[1]) {
return [ matches[1] ];
}
}, },
transformComplete(v) { transformComplete(v) {