grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev'

Browse source
This commit is contained in:
Dessalines 2019-10-16 21:30:32 -07:00
commit 97dc722320
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/src/components/comment-node.tsx vendored
View file

@ -112,7 +112,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
{this.state.showEdit && <CommentForm node={node} edit onReplyCancel={this.handleReplyCancel} disabled={this.props.locked} />} {this.state.showEdit && <CommentForm node={node} edit onReplyCancel={this.handleReplyCancel} disabled={this.props.locked} />}
{!this.state.showEdit && !this.state.collapsed && {!this.state.showEdit && !this.state.collapsed &&
<div> <div>
{this.state.viewSource ? <div>{this.commentUnlessRemoved}</div> : {this.state.viewSource ? <pre>{this.commentUnlessRemoved}</pre> :
<div className="md-div" dangerouslySetInnerHTML={mdToHtml(this.commentUnlessRemoved)} /> <div className="md-div" dangerouslySetInnerHTML={mdToHtml(this.commentUnlessRemoved)} />
} }
<ul class="list-inline mb-1 text-muted small font-weight-bold"> <ul class="list-inline mb-1 text-muted small font-weight-bold">

2
ui/src/components/post-listing.tsx vendored
View file

@ -309,7 +309,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
} }
{this.props.showBody && post.body && {this.props.showBody && post.body &&
<> <>
{this.state.viewSource ? <div>{post.body}</div> : {this.state.viewSource ? <pre>{post.body}</pre> :
<div className="md-div" dangerouslySetInnerHTML={mdToHtml(post.body)} /> <div className="md-div" dangerouslySetInnerHTML={mdToHtml(post.body)} />
} }
</> </>