jyapayne/docsify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge marked renderer function instead of overiding it. (#74)

Browse source
This commit is contained in:
Liu Yuyang 2017-02-13 22:44:43 +08:00 • committed by cinwell.li
commit 434e8d1a36
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/README.md
View file

@ -149,7 +149,7 @@ And it can even be customized
```js ```js
window.$docsify = { window.$docsify = {
markdown: function(marked) { markdown: function(marked, renderer) {
// ... // ...
return marked return marked

2
docs/zh-cn.md
View file

@ -155,7 +155,7 @@ window.$docsify = {
```js ```js
window.$docsify = { window.$docsify = {
markdown: function(marked) { markdown: function(marked, renderer) {
// ... // ...
return marked return marked

6
src/render.js
View file

@ -58,9 +58,11 @@ export function init () {
} }
if (typeof $docsify.markdown === 'function') { if (typeof $docsify.markdown === 'function') {
markdown.setOptions({ renderer }) markdown = $docsify.markdown.call(this, markdown, renderer)
markdown = $docsify.markdown.call(this, markdown)
} else { } else {
if ($docsify.markdown.renderer) {
$docsify.markdown.renderer = merge(renderer, $docsify.markdown.renderer)
}
markdown.setOptions(merge({ renderer }, $docsify.markdown)) markdown.setOptions(merge({ renderer }, $docsify.markdown))
} }

1
src/util.js
View file

@ -164,4 +164,3 @@ export function emojify (text) {
.replace(/:(\w*?):/ig, '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/$1.png" alt="$1" />') .replace(/:(\w*?):/ig, '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/$1.png" alt="$1" />')
.replace(/__colon__/g, ':') .replace(/__colon__/g, ':')
} }