1
0
mirror of https://github.com/trambarhq/relaks-wordpress-example.git synced 2025-09-03 13:12:38 +02:00

Removing errant newline characters (issue #26).

This commit is contained in:
Chung Leong
2019-01-28 11:40:34 +01:00
parent 00b70b36e4
commit 16d399793b
3 changed files with 8 additions and 25 deletions

View File

@@ -47,7 +47,7 @@ class PagePageSync extends PureComponent {
return ( return (
<div className="page"> <div className="page">
<Breadcrumb trail={trail} /> <Breadcrumb trail={trail} />
<PageView page={page} transform={route.transformLink} /> <PageView page={page} transform={route.transformNode} />
<PageList route={route} pages={childPages} /> <PageList route={route} pages={childPages} />
</div> </div>
); );

View File

@@ -102,7 +102,7 @@ class PostPageSync extends PureComponent {
return ( return (
<div className="page"> <div className="page">
<Breadcrumb trail={trail} /> <Breadcrumb trail={trail} />
<PostView post={post} author={author} transform={route.transformLink} /> <PostView post={post} author={author} transform={route.transformNode} />
<CommentSection comments={comments} /> <CommentSection comments={comments} />
</div> </div>
); );

View File

@@ -8,8 +8,6 @@ class Route {
this.history = routeManager.history; this.history = routeManager.history;
this.url = routeManager.url; this.url = routeManager.url;
this.dataSource = dataSource; this.dataSource = dataSource;
this.pageLinkRegExp = null;
this.imageLinkRegExp = null;
} }
change(url, options) { change(url, options) {
@@ -137,28 +135,13 @@ class Route {
} }
} }
transformLink = (node) => { transformNode = (node) => {
if (node.type === 'tag' && node.name === 'a') { if (node.type === 'tag') {
if (this.pageLinkRegExp) { if (node.name === 'a') {
let m = this.pageLinkRegExp.exec(node.attribs.href);
if (m) {
let categorySlug = m[1];
let postSlug = m[3];
node.attribs.href = `/${categorySlug}/${postSlug}/`;
delete node.attribs.target;
this.preloadPage({ categorySlug, postSlug });
return;
}
}
if (this.imageLinkRegExp) {
let m = this.imageLinkRegExp.exec(node.attribs.href);
if (m) {
if (!node.attribs.target) {
node.attribs.target = '_blank';
}
return;
}
} }
} else if (node.type === 'text') {
// trim off leading newline characters
node.data = _.trimStart(node.data, '\r\n');
} }
} }
} }