Merge branch 'master' into versioning

This commit is contained in:
Frank Li 2017-08-08 11:39:23 -07:00 committed by GitHub
commit 9ddd2f5ea4
33 changed files with 702 additions and 90 deletions

View file

@ -32,7 +32,7 @@ if (fs.existsSync(CWD + "/languages.js")) {
}
function readSidebar() {
let allSidebars = require(CWD + "/sidebar.json");
let allSidebars = require(CWD + "/sidebars.json");
Object.assign(allSidebars, versionFallback.sidebarData());
const order = {};
@ -142,18 +142,20 @@ function processMetadata(file) {
const order = readSidebar();
const id = metadata.localized_id;
metadata.sidebar = order[id].sidebar;
metadata.category = order[id].category;
if (order[id]) {
metadata.sidebar = order[id].sidebar;
metadata.category = order[id].category;
if (order[id].next) {
metadata.next_id = order[id].next;
metadata.next = language + "-" + order[id].next;
if (order[id].next) {
metadata.next_id = order[id].next;
metadata.next = language + "-" + order[id].next;
}
if (order[id].previous) {
metadata.previous_id = order[id].previous;
metadata.previous = language + "-" + order[id].previous;
}
}
if (order[id].previous) {
metadata.previous_id = order[id].previous;
metadata.previous = language + "-" + order[id].previous;
}
return { metadata, rawContent: rawContent };
}