From 8a39d160f6e0c0626181279163c95ac88f01e0c5 Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Tue, 1 Dec 2015 22:40:24 +0100
Subject: switch to only use emoji one smileys; remove setting to switch

---
 web/react/utils/emoticons.jsx | 10 +++++++---
 web/react/utils/utils.jsx     |  9 ---------
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx
index 6a8ba6984..8943e9544 100644
--- a/web/react/utils/emoticons.jsx
+++ b/web/react/utils/emoticons.jsx
@@ -1,8 +1,6 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import * as Utils from './utils.jsx';
-
 const emoticonPatterns = {
     smile: /(^|\s)(:-?\))(?=$|\s)/g, // :)
     wink: /(^|\s)(;-?\))(?=$|\s)/g, // ;)
@@ -135,7 +133,7 @@ export function handleEmoticons(text, tokens) {
             const alias = `MM_EMOTICON${index}`;
 
             tokens.set(alias, {
-                value: `<img align="absmiddle" alt="${matchText}" class="emoji" src="${Utils.getImagePathForEmoticon(name)}" title="${matchText}" />`,
+                value: `<img align="absmiddle" alt="${matchText}" class="emoji" src="${getImagePathForEmoticon(name)}" title="${matchText}" />`,
                 originalText: fullMatch
             });
 
@@ -156,3 +154,9 @@ export function handleEmoticons(text, tokens) {
     return output;
 }
 
+export function getImagePathForEmoticon(name) {
+    if (name) {
+        return `/static/images/emoji/${name}.png`;
+    }
+    return `/static/images/emoji`;
+}
\ No newline at end of file
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index df323eb0f..f38d3e051 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -1226,13 +1226,4 @@ export function getPostTerm(post) {
 
 export function isFeatureEnabled(feature) {
     return PreferenceStore.getPreference(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, Constants.FeatureTogglePrefix + feature.label, {value: 'false'}).value === 'true';
-}
-
-export function getImagePathForEmoticon(name, style) {
-    const emojiStyle = style || PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'emoji_style', {value: 'default'}).value;
-
-    if (name) {
-        return `/static/images/emoji/${emojiStyle}/${name}.png`;
-    }
-    return `/static/images/emoji/${emojiStyle}`;
 }
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22