codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 10:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Don't allow mid word emoticons

Browse source
This commit is contained in:
Robin Ward 2014-03-31 17:58:39 -04:00
parent 706fd3c59a
commit 65efb8d83f
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/emoji/assets/javascripts/emoji.js.erb
View file

@ -64,6 +64,14 @@
firstSpace = text.search(/\s/), firstSpace = text.search(/\s/),
contents; contents;
if (prev && prev.length) {
var lastToken = prev[prev.length-1];
if (lastToken && lastToken.charAt) {
var lastChar = lastToken.charAt(lastToken.length-1);
if (lastChar !== ' ') return;
}
}
// If there is no trailing colon, check our translations that begin with colons // If there is no trailing colon, check our translations that begin with colons
if (endPos === -1 || (firstSpace !== -1 && endPos > firstSpace)) { if (endPos === -1 || (firstSpace !== -1 && endPos > firstSpace)) {
translationColonRegexp.lastIndex = 0; translationColonRegexp.lastIndex = 0;