From 512746b4360f2b1b53af6462abfda014f7f0250a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 1 Apr 2014 11:00:51 -0400
Subject: [PATCH] Revert "Revert "FIX: Don't allow mid word emoticons""

This reverts commit efaa066a171623fa383f3d87a6692b046c8bf581.
---
 plugins/emoji/assets/javascripts/emoji.js.erb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index 8d9370940d8..5698426a28a 100644
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@@ -64,6 +64,14 @@
         firstSpace = text.search(/\s/),
         contents;
 
+    if (prev && prev.length) {
+      var lastToken = prev[prev.length-1];
+      if (lastToken && lastToken.charAt) {
+        var lastChar = lastToken.charAt(lastToken.length-1);
+        if (lastChar !== ' ') return;
+      }
+    }
+
     // If there is no trailing colon, check our translations that begin with colons
     if (endPos === -1 || (firstSpace !== -1 && endPos > firstSpace)) {
       translationColonRegexp.lastIndex = 0;