fix: rendering emojis

docsifyjs · Feb 7, 2017 · 8c7e4d7 · 8c7e4d7
1 parent cbaee21
commit 8c7e4d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 2.0.3
 ### Bug fixes
+- fix: rendering emojis
 - fix: css var polyfill
 
 ## 2.0.2

diff --git a/src/render.js b/src/render.js
@@ -39,7 +39,7 @@ export function init () {
   renderer.code = function (code, lang = '') {
     const hl = Prism.highlight(code, Prism.languages[lang] || Prism.languages.markup)
 
-    return `<pre v-pre data-lang="${lang}"><code class="lang-${lang}">${hl.replace(/:/g, '__colon__')}</code></pre>`
+    return `<pre v-pre data-lang="${lang}"><code class="lang-${lang}">${hl}</code></pre>`
   }
   renderer.link = function (href, title, text) {
     if (!/:/.test(href)) {

diff --git a/src/util.js b/src/util.js
@@ -160,6 +160,7 @@ export const merge = Object.assign || function (to) {
 
 export function emojify (text) {
   return text
+    .replace(/<(pre|template)[^>]*?>([\s\S]+)<\/(pre|template)>/g, match => match.replace(/:/g, '__colon__'))
     .replace(/:(\w*?):/ig, '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/$1.png" alt="$1" />')
     .replace(/__colon__/g, ':')
 }