Redux #115

Merged
6ea86b96 merged 57 commits from redux into redux 2017-05-05 22:55:12 +02:00
3 changed files with 12 additions and 8 deletions
Showing only changes of commit 6d35eb69c5 - Show all commits

View file

@ -61,7 +61,6 @@ class FileCardStream extends React.Component {
isResolvingUri,
navigate,
hidePrice,
claim,
} = this.props
const uri = lbryuri.normalize(this.props.uri);

View file

@ -42,7 +42,7 @@ const makeSelect = () => {
obscureNsfw: selectObscureNsfw(state),
metadata: selectMetadataForUri(state, props),
source: selectSourceForUri(state, props),
resolvingUri: selectResolvingUri(state, props),
isResolvingUri: selectResolvingUri(state, props),
})
return select

View file

@ -63,7 +63,9 @@ class FileTileStream extends React.Component {
const {
metadata,
isResolvingUri,
navigate,
hidePrice,
} = this.props
const uri = lbryuri.normalize(this.props.uri);
@ -71,7 +73,14 @@ class FileTileStream extends React.Component {
const title = isConfirmed ? metadata.title : uri;
const obscureNsfw = this.props.obscureNsfw && isConfirmed && metadata.nsfw;
console.debug(this.props)
let description = ""
if (isConfirmed) {
description = metadata.description
} else if (isResolvingUri) {
description = "Loading..."
} else {
description = <span className="empty">This file is pending confirmation</span>
}
return (
<section className={ 'file-tile card ' + (obscureNsfw ? 'card--obscured ' : '') } onMouseEnter={this.handleMouseOver.bind(this)} onMouseLeave={this.handleMouseOut.bind(this)}>
@ -103,11 +112,7 @@ class FileTileStream extends React.Component {
</div>
<div className="card__content">
<p className="file-tile__description">
<TruncatedText lines={2}>
{isConfirmed
? metadata.description
: <span className="empty">This file is pending confirmation.</span>}
</TruncatedText>
<TruncatedText lines={2}>{description}</TruncatedText>
</p>
</div>
</div>