Browse Source

fix smiles

master
Denis Ryabov 11 years ago
parent
commit
39ff8e4480
  1. 6
      jquery-emotions/jquery.emotions.js
  2. 2
      js/twister_formatpost.js

6
jquery-emotions/jquery.emotions.js

@ -81,10 +81,16 @@
var rep = $s.replacement var rep = $s.replacement
.replace(/\{eId\}/g, $s.map[pattern]); .replace(/\{eId\}/g, $s.map[pattern]);
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 text = text
.replace(new RegExp($t.quote(pattern), "g"), rep) .replace(new RegExp($t.quote(pattern), "g"), rep)
.replace(new RegExp($t.quote(encPattent), "g"), rep); .replace(new RegExp($t.quote(encPattent), "g"), rep);
} }
}
return text; return text;
}, },

2
js/twister_formatpost.js

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

Loading…
Cancel
Save