Skip to content

baseUrl's value sometimes wrong when referencing inner website's content #263

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

Merged
yamgent merged 2 commits into from
Jun 22, 2018
Merged

baseUrl's value sometimes wrong when referencing inner website's content #263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0faa1b7
Fix broken baseUrl references for inner websites
yamgent Jun 12, 2018
e3c5d6d
Parser: Fix hostBaseUrl being replaced
yamgent Jun 18, 2018
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
16 changes: 11 additions & 5 deletions lib/markbind/lib/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,27 +543,33 @@ Parser.prototype._rebaseReference = function (node, foundBase) {
});

// rebase current element
if (element.attribs[ATTRIB_CWF]) {
const filePath = element.attribs[ATTRIB_CWF];
if (element.attribs[ATTRIB_INCLUDE_PATH]) {
const filePath = element.attribs[ATTRIB_INCLUDE_PATH];
let newBase = calculateNewBaseUrls(filePath, this.rootPath, this.baseUrlMap);
if (newBase) {
const { relative, parent } = newBase;
// eslint-disable-next-line no-param-reassign
foundBase[parent] = relative;
}

const bases = Object.keys(childrenBase);
const combinedBases = Object.assign({}, childrenBase, foundBase);
const bases = Object.keys(combinedBases);
if (bases.length !== 0) {
// need to rebase
newBase = childrenBase[bases[0]];
newBase = combinedBases[bases[0]];
const { children } = element;
if (children) {
const currentBase = calculateNewBaseUrls(element.attribs[ATTRIB_CWF], this.rootPath, this.baseUrlMap);
if (currentBase) {
if (currentBase.relative !== newBase) {
cheerio.prototype.options.xmlMode = false;
const newBaseUrl = `{{hostBaseUrl}}/${newBase}`;
const rendered = nunjucks.renderString(cheerio.html(children), { baseUrl: newBaseUrl });
const rendered = nunjucks.renderString(cheerio.html(children), {
// This is to prevent the nunjuck call from converting {{hostBaseUrl}} to an empty string
// and let the hostBaseUrl value be injected later.
hostBaseUrl: '{{hostBaseUrl}}',
baseUrl: newBaseUrl,
});
element.children = cheerio.parseHTML(rendered, true);
cheerio.prototype.options.xmlMode = true;
}
Expand Down