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

Merge pull request #3698 from tgxworld/autocomplete 

FIX: Autocomplete and Emojis when bounded by non-word characters.
This commit is contained in:
Régis Hanol 2015-08-26 11:38:27 +02:00
parent 1c6250bff8 a376bc0901
commit 4d0460f760
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,7 +277,7 @@ export default function(options) {
if (options.key && e.which === options.key.charCodeAt(0)) { if (options.key && e.which === options.key.charCodeAt(0)) {
caretPosition = Discourse.Utilities.caretPosition(me[0]); caretPosition = Discourse.Utilities.caretPosition(me[0]);
var prevChar = me.val().charAt(caretPosition - 1); var prevChar = me.val().charAt(caretPosition - 1);
if (!prevChar || /\s/.test(prevChar)) { if (!prevChar || /\W/.test(prevChar)) {
completeStart = completeEnd = caretPosition; completeStart = completeEnd = caretPosition;
updateAutoComplete(options.dataSource("")); updateAutoComplete(options.dataSource(""));
} }
@ -331,7 +331,7 @@ export default function(options) {
stopFound = prev === options.key; stopFound = prev === options.key;
if (stopFound) { if (stopFound) {
prev = me[0].value[c - 1]; prev = me[0].value[c - 1];
if (!prev || /\s/.test(prev)) { if (!prev || /\W/.test(prev)) {
completeStart = c; completeStart = c;
caretPosition = completeEnd = initial; caretPosition = completeEnd = initial;
term = me[0].value.substring(c + 1, initial); term = me[0].value.substring(c + 1, initial);

2
app/assets/javascripts/discourse/lib/emoji/emoji.js.erb
View File

@ -113,7 +113,7 @@ function checkPrev(prev) {
var lastToken = prev[prev.length-1]; var lastToken = prev[prev.length-1];
if (lastToken && lastToken.charAt) { if (lastToken && lastToken.charAt) {
var lastChar = lastToken.charAt(lastToken.length-1); var lastChar = lastToken.charAt(lastToken.length-1);
if (!/\s/.test(lastChar)) return false; if (!/\W/.test(lastChar)) return false;
} }
} }
return true; return true;