Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show full content-type #1333

Merged
merged 3 commits into from
Apr 25, 2018
Merged

Show full content-type #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b07a7bf
show full content-type
btzr-io Apr 17, 2018
168006a
update changelog
btzr-io Apr 17, 2018
c2a010c
Merge branch 'master' into full-content-type
btzr-io Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).

### Fixed
* Black screen on macOS after maximizing LBRY and then closing ([#1235](https://github.com/lbryio/lbry-app/pull/1235))
* Fix content-type not shown correctly in file description ([#863](https://github.com/lbryio/lbry-app/pull/863))

### Fixed
* Black screen on macOS after maximizing LBRY and then closing ([#1235](https://github.com/lbryio/lbry-app/pull/1235))
Expand Down
5 changes: 2 additions & 3 deletions src/renderer/component/fileDetails/view.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// @flow
import * as React from 'react';
import ReactMarkdown from 'react-markdown';
import { Lbry } from 'lbry-redux';
import Button from 'component/button';
import path from 'path';

Expand Down Expand Up @@ -31,8 +30,8 @@ const FileDetails = (props: Props) => {
}

const { description, language, license } = metadata;
const mediaType = Lbry.getMediaType(contentType);


const mediaType = contentType || 'unknown';
const downloadPath = fileInfo ? path.normalize(fileInfo.download_path) : null;

return (
Expand Down