3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-05-04 12:47:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Removes #content from sidebar links and from within pages (#170)

Browse source
This commit is contained in:
Eric Nakagawa 2017-10-24 15:15:52 -07:00 • committed by Joel Marcey
parent c2243a3c20
commit 867a49dd1c
3 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/core/BlogPageLayout.js
View file

@ -19,18 +19,14 @@ const BlogPageLayout = React.createClass({
if (page > 0) { if (page > 0) {
url += "page" + (page + 1) + "/"; url += "page" + (page + 1) + "/";
} }
return url + "#content"; return url;
}, },
render() { render() {
const perPage = this.props.metadata.perPage; const perPage = this.props.metadata.perPage;
const page = this.props.metadata.page; const page = this.props.metadata.page;
return ( return (
<Site <Site title="Blog" language="en" config={this.props.config}>
title="Blog"
language="en"
config={this.props.config}
>
<div className="docMainWrapper wrapper"> <div className="docMainWrapper wrapper">
<BlogSidebar <BlogSidebar
language={this.props.language} language={this.props.language}
@ -53,14 +49,16 @@ const BlogPageLayout = React.createClass({
); );
})} })}
<div className="docs-prevnext"> <div className="docs-prevnext">
{page > 0 && {page > 0 && (
<a className="docs-prev" href={this.getPageURL(page - 1)}> <a className="docs-prev" href={this.getPageURL(page - 1)}>
← Prev ← Prev
</a>} </a>
{MetadataBlog.length > (page + 1) * perPage && )}
{MetadataBlog.length > (page + 1) * perPage && (
<a className="docs-next" href={this.getPageURL(page + 1)}> <a className="docs-next" href={this.getPageURL(page + 1)}>
Next → Next →
</a>} </a>
)}
</div> </div>
</div> </div>
</Container> </Container>

19
lib/core/DocsLayout.js
View file

@ -35,8 +35,7 @@ class DocsLayout extends React.Component {
} }
description={content.trim().split("\n")[0]} description={content.trim().split("\n")[0]}
language={metadata.language} language={metadata.language}
version={metadata.version} version={metadata.version}>
>
<div className="docMainWrapper wrapper"> <div className="docMainWrapper wrapper">
<DocsSidebar metadata={metadata} /> <DocsSidebar metadata={metadata} />
<Container className="mainContainer"> <Container className="mainContainer">
@ -56,30 +55,30 @@ class DocsLayout extends React.Component {
language={metadata.language} language={metadata.language}
/> />
<div className="docs-prevnext"> <div className="docs-prevnext">
{metadata.previous_id && {metadata.previous_id && (
<a <a
className="docs-prev button" className="docs-prev button"
href={metadata.previous_id + ".html#content"} href={metadata.previous_id + ".html"}>
>
←{" "} ←{" "}
{i18n {i18n
? translation[this.props.metadata.language][ ? translation[this.props.metadata.language][
"localized-strings" "localized-strings"
]["previous"] || "Previous" ]["previous"] || "Previous"
: "Previous"} : "Previous"}
</a>} </a>
{metadata.next_id && )}
{metadata.next_id && (
<a <a
className="docs-next button" className="docs-next button"
href={metadata.next_id + ".html#content"} href={metadata.next_id + ".html"}>
>
{i18n {i18n
? translation[this.props.metadata.language][ ? translation[this.props.metadata.language][
"localized-strings" "localized-strings"
]["next"] || "Next" ]["next"] || "Next"
: "Next"}{" "} : "Next"}{" "}
→ →
</a>} </a>
)}
</div> </div>
</Container> </Container>
</div> </div>

14
lib/core/nav/SideNav.js
View file

@ -23,9 +23,7 @@ class SideNav extends React.Component {
</div> </div>
<h2> <h2>
<i>›</i> <i>›</i>
<span> <span>{this.props.current.category}</span>
{this.props.current.category}
</span>
</h2> </h2>
</div> </div>
<div className="navGroups"> <div className="navGroups">
@ -50,12 +48,8 @@ class SideNav extends React.Component {
renderCategory(category) { renderCategory(category) {
return ( return (
<div className="navGroup navGroupActive" key={category.name}> <div className="navGroup navGroupActive" key={category.name}>
<h3> <h3>{this.getLocalizedCategoryString(category.name)}</h3>
{this.getLocalizedCategoryString(category.name)} <ul>{category.links.map(this.renderItemLink, this)}</ul>
</h3>
<ul>
{category.links.map(this.renderItemLink, this)}
</ul>
</div> </div>
); );
} }
@ -91,7 +85,7 @@ class SideNav extends React.Component {
if (metadata.permalink.match(/^https?:/)) { if (metadata.permalink.match(/^https?:/)) {
return metadata.permalink; return metadata.permalink;
} }
return siteConfig.baseUrl + metadata.permalink + "#content"; return siteConfig.baseUrl + metadata.permalink;
} }
if (metadata.path) { if (metadata.path) {
return siteConfig.baseUrl + "blog/" + metadata.path; return siteConfig.baseUrl + "blog/" + metadata.path;