8000 [embedding] feat: allow user configured navbar site by Evidlo · Pull Request #1535 · docsifyjs/docsify · GitHub
[go: up one dir, main page]
Skip to content

[embedding] feat: allow user configured navbar site #1535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open
8000

[embedding] feat: allow user configured navbar site #1535

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c12c68e
allow user configured navbar selection
Evidlo Mar 10, 2021
2b0db83
Merge branch 'develop' into develop
sy-records Mar 11, 2021
bb46a88
Merge branch 'develop' into develop
sy-records Mar 12, 2021
69def1c
Merge branch 'develop' into develop
sy-records Mar 28, 2021
a989914
Merge branch 'develop' into develop
Koooooo-7 Apr 12, 2021
f830976
Merge branch 'develop' into develop
sy-records Jun 23, 2021
fe30b70
add tests for nav_el option
Evidlo Jun 23, 2021
cf05a6f
fix tests to use innerHTML
Evidlo Jun 23, 2021
74a0af0
Merge branch 'develop' into develop
Evidlo Jul 31, 2021
8e5f080
Merge branch 'develop' into develop
trusktr Aug 2, 2021
d9871e1
Merge branch 'develop' into develop
Koooooo-7 Aug 5, 2021
738c39a
rename to camel case
Evidlo Jan 12, 2022
cdde500
dont merge nav when using custom nav element
Evidlo Jan 13, 2022
288d05d
Merge branch 'develop' into develop
Evidlo Jan 13, 2022
02daac4
use navEl when rendering
Evidlo Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
use navEl when rendering
  • Loading branch information
@Evidlo
Evidlo committed Jan 13, 2022
commit 02daac441462d7f0a5d574ee7c4e9d5a8b89b072
9 changes: 3 additions & 6 deletions src/core/render/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,11 @@ export function Render(Base) {
}

_renderNav(text) {
text && this._renderTo('nav', this.compiler.compile(text));
text &&
this._renderTo(this.config.navEl || 'nav', this.compiler.compile(text));
if (this.config.loadNavbar) {
getAndActive(this.router, 'nav');
getAndActive(this.router, this.config.navEl || 'nav');
}

}

_renderMain(text, opt = {}, next) {
Expand Down Expand Up @@ -413,7 +413,6 @@ export function Render(Base) {
const el = dom.find(config.el || '#app');
const navEl = dom.find(config.navEl || 'nav') || dom.create('nav');

const el = dom.find(id);
let html = '';
let navAppendToTarget = dom.body;

Expand All @@ -422,7 +421,6 @@ export function Render(Base) {
html += tpl.corner(config.repo, config.cornerExternalLinkTarge);
}


if (config.coverpage) {
html += tpl.cover();
}
Expand All @@ -444,7 +442,6 @@ export function Render(Base) {
this.rendered = true;
}


if (config.mergeNavbar && isMobile && !config.navEl) {
navAppendToTarget = dom.find('.sidebar');
} else {
Expand Down
0