summaryrefslogtreecommitdiff
path: root/public/js/index.js
diff options
context:
space:
mode:
authorWu Cheng-Han2016-10-18 16:50:58 +0800
committerWu Cheng-Han2016-10-18 16:50:58 +0800
commitd44e8303668a93942644f78adc11c34ec07e6abd (patch)
tree6a3cb3d8a58c3d64bf404ef0f056ea1d75095a32 /public/js/index.js
parenteb724b05a7eb8cfff286ea601c1b34057c0d71dc (diff)
Update emoji parser using markdown-it-emoji instead of emojify to solve issue #217
Diffstat (limited to '')
-rw-r--r--public/js/index.js4
1 files changed, 3 insertions, 1 deletions
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 + ': ';