From 39ff8e44808e99a34e9e70b10abe90b1583ae5ac Mon Sep 17 00:00:00 2001
From: Denis Ryabov <denis@mobilejoomla.com>
Date: Fri, 14 Mar 2014 17:45:07 +0400
Subject: [PATCH] fix smiles

---
 jquery-emotions/jquery.emotions.js | 12 +++++++++---
 js/twister_formatpost.js           |  2 --
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/jquery-emotions/jquery.emotions.js b/jquery-emotions/jquery.emotions.js
index a4a111e..2ed5e16 100644
--- a/jquery-emotions/jquery.emotions.js
+++ b/jquery-emotions/jquery.emotions.js
@@ -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;
diff --git a/js/twister_formatpost.js b/js/twister_formatpost.js
index 30f4134..081b1d8 100644
--- a/js/twister_formatpost.js
+++ b/js/twister_formatpost.js
@@ -238,9 +238,7 @@ function htmlFormatMsg( msg, output, mentions ) {
 
 function _parseText(text)
 {
-    text = unescapeHtmlEntities(text);
     text = $.emotions(text);
-    text = escapeHtmlEntities(text);
     return text;
 }