Update emoji parser using markdown-it-emoji instead of emojify to solve issue #217
|
@ -30,7 +30,8 @@
|
|||
"velocity": "^1.3.1",
|
||||
"randomcolor": "randomColor#^0.4.4",
|
||||
"Idle.Js": "idle.js#^1.0.0",
|
||||
"gist-embed": "*"
|
||||
"gist-embed": "*",
|
||||
"emojify.js": "^1.1.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"jquery": "~3.1.1"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
"cookie-parser": "1.4.3",
|
||||
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
|
||||
"ejs": "^2.5.2",
|
||||
"emojify.js": "^1.1.0",
|
||||
"engine.io-client": "^1.7.0",
|
||||
"express": ">=4.14",
|
||||
"express-session": "^1.14.1",
|
||||
|
|
|
@ -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');
|
||||
|
|
|
@ -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 + ': ';
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
.emoji {
|
||||
width: 1.5em;
|
||||
height: 1.5em;
|
||||
display: inline-block;
|
||||
margin-bottom: -0.25em;
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
.emoji{width:1.5em;height:1.5em;display:inline-block;margin-bottom:-.25em}
|
Before Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 5.0 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 6.4 KiB |
Before Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 5.0 KiB |
Before Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 4.7 KiB |
Before Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 6.0 KiB |
Before Width: | Height: | Size: 6.4 KiB |
Before Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 4.7 KiB |
Before Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 3.9 KiB |