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

Merge pull request #50 from lbryio/hide-watch-button

Browse source 
Hide Watch button for non-video content everywhere, not just My Files page
This commit is contained in:
Jeremy Kauffman 2016-09-02 08:05:21 -04:00 committed by GitHub
commit 9a52f69b72
4 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/lbry.js
View file

@ -283,7 +283,10 @@ lbry.imagePath = function(file)
return lbry.rootPath + '/img/' + file;
}
lbry.getMediaType = function(filename) {
lbry.getMediaType = function(contentType, fileName) {
if (contentType) {
return /^[^/]+/.exec(contentType);
} else {
var dotIndex = filename.lastIndexOf('.');
if (dotIndex == -1) {
return 'unknown';
@ -300,6 +303,7 @@ lbry.getMediaType = function(filename) {
return 'unknown';
}
}
}
lbry.stop = function(callback) {
lbry.call('stop', {}, callback);

6
js/page/discover.js
View file

@ -105,7 +105,7 @@ var SearchResultRow = React.createClass({
<div className="meta"><a href={'/?show=' + this.props.name}>lbry://{this.props.name}</a></div>
<h3 style={searchRowTitleStyle}><a href={'/?show=' + this.props.name}>{this.props.title}</a></h3>
<div>
<WatchLink streamName={this.props.name} button="primary" />
{this.props.mediaType == 'video' ? <WatchLink streamName={this.props.name} button="primary" /> : null}
<DownloadLink streamName={this.props.name} button="text" />
</div>
<p style={searchRowDescriptionStyle}>{this.props.description}</p>
@ -175,8 +175,8 @@ var FeaturedContentItem = React.createClass({
return (<div style={featuredContentItemContainerStyle}>
<SearchResultRow name={this.props.name} title={this.state.title} imgUrl={this.state.metadata.thumbnail || '/img/default-thumb.svg'}
description={this.state.metadata.description} cost={this.state.amount} nsfw={this.state.metadata.nsfw}
available={this.state.available} />
description={this.state.metadata.description} mediaType={lbry.getMediaType(this.state.metadata.content_type)}
cost={this.state.amount} nsfw={this.state.metadata.nsfw} available={this.state.available} />
</div>);
}
});

4
js/page/my_files.js
View file

@ -195,7 +195,9 @@ var MyFilesPage = React.createClass({
}
var ratioLoaded = written_bytes / total_bytes;
var showWatchButton = (lbry.getMediaType(file_name) == 'video' || lbry.getMediaType(file_name) == 'audio');
var mediaType = lbry.getMediaType(metadata.content_type, file_name);
var showWatchButton = (mediaType == 'video');
content.push(<MyFilesRow key={lbry_uri} lbryUri={lbry_uri} title={title || ('lbry://' + lbry_uri)} completed={completed} stopped={stopped}
ratioLoaded={ratioLoaded} imgUrl={thumbnail} path={download_path}

3
js/page/show.js
View file

@ -24,6 +24,7 @@ var FormatItem = React.createClass({
var language = claimInfo.language;
var license = claimInfo.license;
var fileContentType = (claimInfo.content_type || claimInfo['content-type']);
var mediaType = lbry.getMediaType(fileContentType);
var available = this.props.available;
var amount = this.props.amount || 0.0;
@ -56,7 +57,7 @@ var FormatItem = React.createClass({
</table>
</section>
<section>
<WatchLink streamName={this.props.name} button="primary" />
{mediaType == 'video' ? <WatchLink streamName={this.props.name} button="primary" /> : null}
<DownloadLink streamName={this.props.name} button="alt" />
</section>
</div>