dirty, unacceptable image rendering
This commit is contained in:
parent
8f76224ce4
commit
51ec4aca6f
2 changed files with 16 additions and 0 deletions
|
@ -13,6 +13,7 @@ import {
|
|||
selectChannelIsBlocked,
|
||||
doClearPublish,
|
||||
doPrepareEdit,
|
||||
makeSelectMediaTypeForUri,
|
||||
} from 'lbry-redux';
|
||||
import { selectBlackListedOutpoints, selectFilteredOutpoints } from 'lbryinc';
|
||||
import { selectShowMatureContent } from 'redux/selectors/settings';
|
||||
|
@ -30,6 +31,7 @@ const select = (state, props) => ({
|
|||
isResolvingUri: props.uri && makeSelectIsUriResolving(props.uri)(state),
|
||||
thumbnail: props.uri && makeSelectThumbnailForUri(props.uri)(state),
|
||||
title: props.uri && makeSelectTitleForUri(props.uri)(state),
|
||||
mediaType: makeSelectMediaTypeForUri(props.uri)(state),
|
||||
nsfw: props.uri && makeSelectClaimIsNsfw(props.uri)(state),
|
||||
blackListedOutpoints: selectBlackListedOutpoints(state),
|
||||
filteredOutpoints: selectFilteredOutpoints(state),
|
||||
|
|
|
@ -17,6 +17,7 @@ import SubscribeButton from 'component/subscribeButton';
|
|||
import ChannelThumbnail from 'component/channelThumbnail';
|
||||
import BlockButton from 'component/blockButton';
|
||||
import Button from 'component/button';
|
||||
import { generateStreamUrl } from '../../util/lbrytv';
|
||||
|
||||
type Props = {
|
||||
uri: string,
|
||||
|
@ -29,6 +30,7 @@ type Props = {
|
|||
isResolvingUri: boolean,
|
||||
history: { push: string => void },
|
||||
thumbnail: string,
|
||||
mediaType: string,
|
||||
title: string,
|
||||
nsfw: boolean,
|
||||
placeholder: string,
|
||||
|
@ -62,6 +64,7 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
|
|||
isResolvingUri,
|
||||
thumbnail,
|
||||
title,
|
||||
mediaType,
|
||||
nsfw,
|
||||
resolveUri,
|
||||
claim,
|
||||
|
@ -195,13 +198,18 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
|
|||
'claim-preview--pending': pending,
|
||||
})}
|
||||
>
|
||||
<<<<<<< HEAD
|
||||
{isChannel && claim ? (
|
||||
=======
|
||||
{isChannel ? (
|
||||
>>>>>>> dirty, unacceptable image rendering
|
||||
<UriIndicator uri={uri} link>
|
||||
<ChannelThumbnail uri={uri} obscure={channelIsBlocked} />
|
||||
</UriIndicator>
|
||||
) : (
|
||||
<FileThumbnail thumbnail={thumbnail} />
|
||||
)}
|
||||
<<<<<<< HEAD
|
||||
<div className="claim-preview__text">
|
||||
<div className="claim-preview-metadata">
|
||||
<div className="claim-preview-info">
|
||||
|
@ -209,6 +217,12 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
|
|||
{claim ? <TruncatedText text={title || claim.name} lines={2} /> : <span>{__('Nothing here')}</span>}
|
||||
</div>
|
||||
{!isChannel && claim && <FileProperties uri={uri} />}
|
||||
=======
|
||||
<div className="claim-preview-metadata">
|
||||
<div className="claim-preview-info">
|
||||
<div className="claim-preview-title">
|
||||
{claim ? <TruncatedText text={title || claim.name} lines={1} /> : <span>{__('Nothing here')}</span>}
|
||||
>>>>>>> dirty, unacceptable image rendering
|
||||
</div>
|
||||
|
||||
<div className="media__subtitle">
|
||||
|
|
Loading…
Reference in a new issue