From 965ff51efef7f6c6b54e476b80f83dbb209e73bc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 27 Aug 2014 14:40:29 -0400
Subject: [PATCH] FIX: Better boundary checking for emoji

---
 plugins/emoji/assets/javascripts/emoji.js.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index f1faf62e985f8b..7cda624ba4718f 100644
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@@ -80,6 +80,10 @@
       translationColonRegexp.lastIndex = 0;
       var m = translationColonRegexp.exec(text);
       if (m && m[0] && text.indexOf(m[0]) === 0) {
+
+        // Check outer edge
+        var lastChar = text.charAt(m[0].length);
+        if (lastChar && (lastChar !== ' ' && lastChar !== "\n")) return;
         contents = imageFor(translationsWithColon[m[0]]);
         if (contents) {
           return [m[0].length, contents];