diff options
Diffstat (limited to 'public/js/extra.js')
-rw-r--r-- | public/js/extra.js | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/public/js/extra.js b/public/js/extra.js index 01aff7c7..436721a3 100644 --- a/public/js/extra.js +++ b/public/js/extra.js @@ -246,12 +246,6 @@ function finishView(view) { if ($(value).children().length == 0) $(value).gist(viewAjaxCallback); }); - //emojify - try { - emojify.run(view[0]); - } catch (err) { - console.warn(err); - } //mathjax var mathjaxdivs = view.find('span.mathjax.raw').removeClass("raw").toArray(); try { @@ -823,15 +817,6 @@ function highlightRender(code, lang) { return result.value; } -emojify.setConfig({ - blacklist: { - elements: ['script', 'textarea', 'a', 'pre', 'code', 'svg'], - classes: ['no-emojify'] - }, - img_dir: serverurl + '/vendor/emojify/images', - ignore_emoticons: true -}); - var markdownit = require('markdown-it'); var markdownitContainer = require('markdown-it-container'); @@ -855,6 +840,25 @@ md.use(require('markdown-it-sup')); md.use(require('../vendor/markdown-it-mathjax')); md.use(require('markdown-it-imsize')); +md.use(require('markdown-it-emoji'), { + shortcuts: false +}); + +var emojify = require('emojify.js'); + +emojify.setConfig({ + blacklist: { + elements: ['script', 'textarea', 'a', 'pre', 'code', 'svg'], + classes: ['no-emojify'] + }, + img_dir: serverurl + '/vendor/emojify.js/dist/images/basic', + ignore_emoticons: true +}); + +md.renderer.rules.emoji = function(token, idx) { + return emojify.replace(':' + token[idx].markup + ':'); +}; + function renderContainer(tokens, idx, options, env, self) { tokens[idx].attrJoin('role', 'alert'); tokens[idx].attrJoin('class', 'alert'); |