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

Merge pull request #11 from dryabov/master

Browse Source 
fix smiles after html entity
This commit is contained in:
iHedgehog 2014-03-14 16:49:27 +03:00
commit ad65716dcb
2 changed files with 9 additions and 4 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 var rep = $s.replacement
.replace(/\{eId\}/g, $s.map[pattern]); .replace(/\{eId\}/g, $s.map[pattern]);
text = text if (pattern[0] === ';') {
.replace(new RegExp($t.quote(pattern), "g"), rep) text = text
.replace(new RegExp($t.quote(encPattent), "g"), rep); .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; return text;

1
js/twister_formatpost.js
View File

@ -269,4 +269,3 @@ function _extractHashtag(s) {
function escapeHtmlEntities(str) { 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;');
} }