twisterarmy/twister-calm
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-calm.git synced 2025-02-04 19:14:30 +00:00
Code Issues Projects Releases Wiki Activity

fix smiles

Browse Source
This commit is contained in:
Denis Ryabov 2014-03-14 17:45:07 +04:00
parent c15731ebd1
commit 39ff8e4480
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jquery-emotions/jquery.emotions.js
View File

@ -81,9 +81,15 @@
var rep = $s.replacement
.replace(/\{eId\}/g, $s.map[pattern]);
text = text
.replace(new RegExp($t.quote(pattern), "g"), rep)
.replace(new RegExp($t.quote(encPattent), "g"), rep);
if (pattern[0] === ';') {
text = text
.replace(new RegExp("(^|\W)" + $t.quote(pattern), "g"), "\\1" + rep)
.replace(new RegExp("(^|\W)" + $t.quote(encPattent), "g"), "\\1" + rep);
} else {
text = text
.replace(new RegExp($t.quote(pattern), "g"), rep)
.replace(new RegExp($t.quote(encPattent), "g"), rep);
}
}
return text;

2
js/twister_formatpost.js
View File

@ -238,9 +238,7 @@ function htmlFormatMsg( msg, output, mentions ) {
function _parseText(text)
{
text = unescapeHtmlEntities(text);
text = $.emotions(text);
text = escapeHtmlEntities(text);
return text;
}