From efaa066a171623fa383f3d87a6692b046c8bf581 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 31 Mar 2014 18:29:26 -0400
Subject: [PATCH] Revert "FIX: Don't allow mid word emoticons"

This reverts commit 65efb8d83fdeeb6e48c1d6a1b0668085b4461daf.
---
 plugins/emoji/assets/javascripts/emoji.js.erb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index 5698426a2..8d9370940 100644
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@@ -64,14 +64,6 @@
         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;