From d44e8303668a93942644f78adc11c34ec07e6abd Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Tue, 18 Oct 2016 16:50:58 +0800
Subject: Update emoji parser using markdown-it-emoji instead of emojify to
 solve issue #217

---
 public/js/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'public/js/index.js')

diff --git a/public/js/index.js b/public/js/index.js
index 7294a5ba..bdd4c822 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -3732,6 +3732,8 @@ function matchInContainer(text) {
     }
 }
 
+var emojify = require('emojify.js');
+
 $(editor.getInputField())
     .textcomplete([
         { // emoji strategy
@@ -3751,7 +3753,7 @@ $(editor.getInputField())
                 callback(list);
             },
             template: function (value) {
-                return '<img class="emoji" src="' + serverurl + '/vendor/emojify/images/' + value + '.png"></img> ' + value;
+                return '<img class="emoji" src="' + serverurl + '/vendor/emojify.js/dist/images/basic/' + value + '.png"></img> ' + value;
             },
             replace: function (value) {
                 return '$1:' + value + ': ';
-- 
cgit v1.2.3