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

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

This reverts commit 65efb8d83f.
This commit is contained in:
Robin Ward 2014-03-31 18:29:26 -04:00
parent 65efb8d83f
commit efaa066a17
1 changed files with 0 additions and 8 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,14 +64,6 @@
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;