Skip to content

Commit 0f966e2

Browse files
committed
bump 0.6.0
1 parent d07ddaa commit 0f966e2

File tree

5 files changed

+32
-10
lines changed

5 files changed

+32
-10
lines changed

lib/docsify.js

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,6 +2178,7 @@ Prism.languages.js = Prism.languages.javascript;
21782178
function corner (data) {
21792179
if (!data) { return '' }
21802180
if (!/\/\//.test(data)) { data = 'https://github.com/' + data; }
2181+
data = data.replace(/^git\+/, '');
21812182

21822183
return ("\n <a href=\"" + data + "\" class=\"github-corner\" aria-label=\"View source on Github\">\n <svg viewBox=\"0 0 250 250\" aria-hidden=\"true\">\n <path d=\"M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z\"></path>\n <path d=\"M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2\" fill=\"currentColor\" style=\"transform-origin: 130px 106px;\" class=\"octo-arm\"></path>\n <path d=\"M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z\" fill=\"currentColor\" class=\"octo-body\"></path>\n </svg>\n </a>")
21832184
}
@@ -2190,6 +2191,11 @@ function main () {
21902191
return "<main>\n <aside class=\"sidebar\"></aside>\n <section class=\"content\">\n <article class=\"markdown-section\"></article>\n </section>\n </main>"
21912192
}
21922193

2194+
function toggle (bool) {
2195+
if (!bool) { return '' }
2196+
return "<button class=\"sidebar-toggle\">\n <span></span><span></span><span></span>\n </button>"
2197+
}
2198+
21932199
/**
21942200
* Render tree
21952201
* @param {Array} tree
@@ -2283,6 +2289,17 @@ function activeLink (dom, activeParent) {
22832289
});
22842290
}
22852291

2292+
/**
2293+
* sidebar toggle
2294+
*/
2295+
function bindToggle (dom) {
2296+
dom = typeof dom === 'object' ? dom : document.querySelector(dom);
2297+
if (!dom) { return }
2298+
var main = document.querySelector('main');
2299+
2300+
dom.addEventListener('click', function () { return main.classList.toggle('close'); });
2301+
}
2302+
22862303
var renderTo = function (dom, content) {
22872304
dom = typeof dom === 'object' ? dom : document.querySelector(dom);
22882305
dom.innerHTML = content;
@@ -2319,19 +2336,22 @@ marked.setOptions({ renderer: renderer });
23192336
function renderApp (dom, replace, opts) {
23202337
var nav = document.querySelector('nav') || document.createElement('nav');
23212338

2322-
dom[replace ? 'outerHTML' : 'innerHTML'] = corner(opts.repo) + main();
2339+
dom[replace ? 'outerHTML' : 'innerHTML'] = toggle(opts.sidebarToggle) + corner(opts.repo) + main();
23232340
document.body.insertBefore(nav, document.body.children[0]);
2341+
2342+
// bind toggle
2343+
bindToggle('button.sidebar-toggle');
23242344
}
23252345

23262346
/**
23272347
* article
23282348
*/
2329-
function renderArticle (content) {
2349+
function renderArticle (content, OPTIONS) {
23302350
if ( content === void 0 ) content = 'not found';
23312351

23322352
renderTo('article', marked(content));
2333-
if (!renderSidebar.rendered) { renderSidebar(null); }
2334-
if (!renderNavbar.rendered) { renderNavbar(null); }
2353+
if (!renderSidebar.rendered) { renderSidebar(null, OPTIONS); }
2354+
if (!renderNavbar.rendered) { renderNavbar(null, OPTIONS); }
23352355
}
23362356

23372357
/**
@@ -2374,6 +2394,7 @@ var OPTIONS = {
23742394
repo: '',
23752395
maxLevel: 6,
23762396
sidebar: '',
2397+
sidebarToggle: false,
23772398
loadSidebar: null,
23782399
loadNavbar: null
23792400
};
@@ -2383,7 +2404,7 @@ var script = document.currentScript || [].slice.call(document.getElementsByTagNa
23832404
if (script) {
23842405
for (var prop in OPTIONS) {
23852406
var val = script.getAttribute('data-' + camel2kebab(prop));
2386-
OPTIONS[prop] = isNil(val) ? OPTIONS[prop] : true;
2407+
OPTIONS[prop] = isNil(val) ? OPTIONS[prop] : (val || true);
23872408
}
23882409
if (OPTIONS.loadSidebar === true) { OPTIONS.loadSidebar = '_sidebar.md'; }
23892410
if (OPTIONS.loadNavbar === true) { OPTIONS.loadNavbar = '_navbar.md'; }
@@ -2402,7 +2423,8 @@ var Docsify = function () {
24022423

24032424
// Render markdown file
24042425
load((loc + ".md"))
2405-
.then(renderArticle, function (_) { return renderArticle(); });
2426+
.then(function (content) { return renderArticle(content, OPTIONS); },
2427+
function (_) { return renderArticle(null, OPTIONS); });
24062428

24072429
// Render sidebar
24082430
if (OPTIONS.loadSidebar) {

lib/docsify.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/themes/buble.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/themes/pure.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)