[build] 4.4.0

This commit is contained in:
qingwei.li
2017-10-30 19:02:55 +08:00
parent 36bfc9d91d
commit e8b5b09f2c
9 changed files with 48 additions and 28 deletions

View File

@@ -1,6 +1,6 @@
![logo](_media/icon.svg)
# docsify <small>4.3.15</small>
# docsify <small>4.4.0</small>
> A magical documentation site generator.

View File

@@ -2810,9 +2810,11 @@ var Compiler = function Compiler (config, router) {
if (isFn(mdConf)) {
compile = mdConf(marked, renderer);
} else {
marked.setOptions(merge(mdConf, {
renderer: merge(renderer, mdConf.renderer)
}));
marked.setOptions(
merge(mdConf, {
renderer: merge(renderer, mdConf.renderer)
})
);
compile = marked;
}
@@ -2881,33 +2883,51 @@ Compiler.prototype._initRenderer = function _initRenderer () {
origin.code = renderer.code = function (code, lang) {
if ( lang === void 0 ) lang = '';
var hl = prism.highlight(code, prism.languages[lang] || prism.languages.markup);
var hl = prism.highlight(
code,
prism.languages[lang] || prism.languages.markup
);
return ("<pre v-pre data-lang=\"" + lang + "\"><code class=\"lang-" + lang + "\">" + hl + "</code></pre>")
};
origin.link = renderer.link = function (href, title, text) {
var blank = '';
if ( title === void 0 ) title = '';
if (!/:|(\/{2})/.test(href) &&
!_self.matchNotCompileLink(href) &&
!/(\s?:ignore)(\s\S+)?$/.test(title)) {
href = router.toURL(href, null, router.getCurrentPath());
} else {
blank = " target=\"" + linkTarget + "\"";
title = title && title.replace(/:ignore/g, '').trim();
var attrs = '';
var config = {};
if (title) {
title = title
.replace(/:(\w+)=?(\w+)?/g, function (m, key, value) {
config[key] = value || true;
return ''
})
.trim();
}
var target = title && title.match(/:target=\w+/);
if (target) {
target = target[0];
title = title.replace(target, '');
blank = ' ' + target.slice(1);
if (
!/:|(\/{2})/.test(href) &&
!_self.matchNotCompileLink(href) &&
!config.ignore
) {
href = router.toURL(href, null, router.getCurrentPath());
} else {
attrs += " target=\"" + linkTarget + "\"";
}
if (config.target) {
attrs += ' target=' + config.target;
}
if (config.disabled) {
attrs += ' disabled';
href = 'javascript:void(0)';
}
if (title) {
title = " title=\"" + title + "\"";
}
return ("<a href=\"" + href + "\"" + (title || '') + blank + ">" + text + "</a>")
return ("<a href=\"" + href + "\"" + (title || '') + attrs + ">" + text + "</a>")
};
origin.paragraph = renderer.paragraph = function (text) {
if (/^!&gt;/.test(text)) {
@@ -3990,7 +4010,7 @@ initGlobalAPI();
/**
* Version
*/
Docsify.version = '4.3.15';
Docsify.version = '4.4.0';
/**
* Run Docsify

4
lib/docsify.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -37,5 +37,5 @@
"integrity": "sha1-6DWIAbhrg7F1YNTjw4LXrvIQCUQ="
}
},
"version": "4.3.15"
"version": "4.4.0"
}

View File

@@ -1,6 +1,6 @@
{
"name": "docsify-server-renderer",
"version": "4.3.15",
"version": "4.4.0",
"description": "docsify server renderer",
"author": {
"name": "qingwei-li",