bump: 3.4.2

This commit is contained in:
qingwei.li 2017-03-11 19:31:57 +08:00
commit 9b858fc4c4
3 changed files with 7 additions and 2 deletions

View file

@ -1,4 +1,8 @@
# 3.4.2 / 2017-03-11
* feat(emojify): add no-emoji option
# 3.4.1 / 2017-03-10
* fix(dom): Disable the dom cache when vue is present, fixed [#119](https://github.com/QingWei-Li/docsify/issues/119)

View file

@ -75,6 +75,7 @@ var config = merge({
nameLink: window.location.pathname,
autoHeader: false,
executeScript: null,
noEmoji: false,
ga: ''
}, window.$docsify);
@ -2938,7 +2939,7 @@ function replace (m, $1) {
}
function emojify (text) {
return text
return $docsify.noEmoji ? text : text
.replace(/<(pre|template|code)[^>]*?>[\s\S]+?<\/(pre|template|code)>/g, function (m) { return m.replace(/:/g, '__colon__'); })
.replace(/:(\w+?):/ig, window.emojify || replace)
.replace(/__colon__/g, ':')

2
lib/docsify.min.js vendored

File diff suppressed because one or more lines are too long