Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't show emoji selector when ending a line with a colon

This commit is contained in:
Robin Ward 2017-06-13 14:25:09 -04:00
parent 299339a373
commit 74858fd450
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,8 +338,7 @@ export default Ember.Component.extend({
}, },
onKeyUp(text, cp) { onKeyUp(text, cp) {
const subtext = text.substring(0, cp); return text.substring(0, cp).match(/(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/g);
return subtext.match(/(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gm);
}, },
transformComplete(v) { transformComplete(v) {

2
app/assets/javascripts/discourse/lib/autocomplete.js.es6
View File

@ -363,7 +363,7 @@ export default function(options) {
if (options.key) { if (options.key) {
if (options.onKeyUp && key !== options.key) { if (options.onKeyUp && key !== options.key) {
var match = options.onKeyUp(me.val(), cp); let match = options.onKeyUp(me.val(), cp);
if (match) { if (match) {
completeStart = cp - match[0].length; completeStart = cp - match[0].length;
completeEnd = completeStart + match[0].length - 1; completeEnd = completeStart + match[0].length - 1;