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

docsifyjs · Feb 13, 2017 · 434e8d1 · 434e8d1
1 parent 287b0a6
commit 434e8d1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -149,7 +149,7 @@ And it can even be customized
 
 ```js
 window.$docsify = {
-  markdown: function(marked) {
+  markdown: function(marked, renderer) {
     // ...
 
     return marked

diff --git a/docs/zh-cn.md b/docs/zh-cn.md
@@ -155,7 +155,7 @@ window.$docsify = {
 
 ```js
 window.$docsify = {
-  markdown: function(marked) {
+  markdown: function(marked, renderer) {
     // ...
 
     return marked

diff --git a/src/render.js b/src/render.js
@@ -58,9 +58,11 @@ export function init () {
   }
 
   if (typeof $docsify.markdown === 'function') {
-    markdown.setOptions({ renderer })
-    markdown = $docsify.markdown.call(this, markdown)
+    markdown = $docsify.markdown.call(this, markdown, renderer)
   } else {
+    if ($docsify.markdown.renderer) {
+      $docsify.markdown.renderer = merge(renderer, $docsify.markdown.renderer)
+    }
     markdown.setOptions(merge({ renderer }, $docsify.markdown))
   }
 

diff --git a/src/util.js b/src/util.js
@@ -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(/__colon__/g, ':')
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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(/__colon__/g, ':')
		}