twisterarmy/twister-calm
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-calm.git synced 2025-01-12 16:07:58 +00:00
Code Issues Projects Releases Wiki Activity

fix converting html entities into emoticons (e.g. "")")

Browse Source
This commit is contained in:
Denis Ryabov 2014-03-14 00:25:49 +04:00
parent d9d0a4eed3
commit c15731ebd1
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/twister_formatpost.js
View File

@ -157,7 +157,7 @@ function htmlFormatMsg( msg, output, mentions ) {
if( match ) { if( match ) {
index = (match[0] === match[1]) ? match.index : match.index + 1; index = (match[0] === match[1]) ? match.index : match.index + 1;
if( match[1] == "@" ) { if( match[1] == "@" ) {
output.append($.emotions(msg.substr(0, index))); output.append(_parseText(msg.substr(0, index)));
tmp = msg.substr(index+1); tmp = msg.substr(index+1);
var username = _extractUsername(tmp); var username = _extractUsername(tmp);
if( username.length ) { if( username.length ) {
@ -177,7 +177,7 @@ function htmlFormatMsg( msg, output, mentions ) {
} }
if( reHttp.exec(match[1]) ) { if( reHttp.exec(match[1]) ) {
output.append($.emotions(msg.substr(0, index))); output.append(_parseText(msg.substr(0, index)));
tmp = msg.substring(index); tmp = msg.substring(index);
var space = tmp.indexOf(" "); var space = tmp.indexOf(" ");
var url; var url;
@ -195,7 +195,7 @@ function htmlFormatMsg( msg, output, mentions ) {
} }
if( reEmail.exec(match[1]) ) { if( reEmail.exec(match[1]) ) {
output.append($.emotions(msg.substr(0, index))); output.append(_parseText(msg.substr(0, index)));
tmp = msg.substring(index); tmp = msg.substring(index);
var space = tmp.indexOf(" "); var space = tmp.indexOf(" ");
var email; var email;
@ -213,7 +213,7 @@ function htmlFormatMsg( msg, output, mentions ) {
} }
if( match[1] == "#" ) { if( match[1] == "#" ) {
output.append($.emotions(msg.substr(0, index))); output.append(_parseText(msg.substr(0, index)));
tmp = msg.substr(index+1); tmp = msg.substr(index+1);
var hashtag = _extractHashtag(tmp); var hashtag = _extractHashtag(tmp);
if( hashtag.length ) { if( hashtag.length ) {
@ -231,11 +231,19 @@ function htmlFormatMsg( msg, output, mentions ) {
} }
} }
output.append($.emotions(msg)); output.append(_parseText(msg));
msg = ""; msg = "";
} }
} }
function _parseText(text)
{
text = unescapeHtmlEntities(text);
text = $.emotions(text);
text = escapeHtmlEntities(text);
return text;
}
// internal function for htmlFormatMsg // internal function for htmlFormatMsg
function _extractUsername(s) { function _extractUsername(s) {
var username = ""; var username = "";
@ -270,3 +278,7 @@ function escapeHtmlEntities(str) {
return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;'); return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;');
} }
function unescapeHtmlEntities(str) {
return str.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&amp;/g, '&');
}