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

Revert "Revert "FIX: Don't allow mid word emoticons"" 

This reverts commit efaa066a17.
This commit is contained in:
Robin Ward 2014-04-01 11:00:51 -04:00
parent 89a3311bf5
commit 512746b436
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/),
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 (endPos === -1 || (firstSpace !== -1 && endPos > firstSpace)) {
translationColonRegexp.lastIndex = 0;