LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge pull request #2263 from lbryio/file-fix

Browse source 
fix: show 'no preview available' for files correctly
This commit is contained in:
Sean Yesmunt 2019-02-04 17:01:39 -05:00 • committed by GitHub
commit eaf9968b2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/renderer/component/fileViewer/internal/player.jsx
View file

@ -283,8 +283,8 @@ class MediaPlayer extends React.PureComponent {
const isLoadingFile = !fileSource && isFileType; const isLoadingFile = !fileSource && isFileType;
const isLbryPackage = /application\/x(-ext)?-lbry$/.test(contentType); const isLbryPackage = /application\/x(-ext)?-lbry$/.test(contentType);
const isUnsupported = const isUnsupported =
!isLbryPackage && (!this.supportedType() && !isFileType && !isPlayableType); (mediaType === 'application' && !isLbryPackage) ||
(!this.supportedType() && !isFileType && !isPlayableType);
// Media (audio, video) // Media (audio, video)
const isUnplayable = isPlayableType && unplayable; const isUnplayable = isPlayableType && unplayable;
const isLoadingMetadata = isPlayableType && (!hasMetadata && !unplayable); const isLoadingMetadata = isPlayableType && (!hasMetadata && !unplayable);

9
src/renderer/redux/selectors/app.js
View file

@ -118,7 +118,6 @@ export const selectNavLinks = createSelector(
page === PAGES.WALLET || page === PAGES.WALLET ||
page === PAGES.SEND || page === PAGES.SEND ||
page === PAGES.GET_CREDITS || page === PAGES.GET_CREDITS ||
page === PAGES.REWARDS ||
page === PAGES.HISTORY || page === PAGES.HISTORY ||
page === PAGES.BACKUP; page === PAGES.BACKUP;
@ -177,9 +176,6 @@ export const selectNavLinks = createSelector(
{ {
...buildLink('Get Credits', PAGES.GET_CREDITS), ...buildLink('Get Credits', PAGES.GET_CREDITS),
}, },
{
...buildLink('Rewards', PAGES.REWARDS),
},
{ {
...buildLink('Backup', PAGES.BACKUP), ...buildLink('Backup', PAGES.BACKUP),
}, },
@ -208,6 +204,11 @@ export const selectNavLinks = createSelector(
...buildLink('Invite', PAGES.INVITE), ...buildLink('Invite', PAGES.INVITE),
icon: ICONS.INVITE, icon: ICONS.INVITE,
}, },
{
...buildLink('Rewards', PAGES.REWARDS),
// This probably shouldn't use the "FEATURED" icon, but not sure what else to use
icon: ICONS.FEATURED,
},
{ {
...buildLink('Downloads', PAGES.DOWNLOADED), ...buildLink('Downloads', PAGES.DOWNLOADED),
icon: ICONS.LOCAL, icon: ICONS.LOCAL,