LBRYFoundation/lbry-desktop
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-desktop.git synced 2025-09-03 02:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #181 from lbryio/always-show-cancel

Browse source 
On load screen, always show Cancel link if a previous page is available
This commit is contained in:
Jeremy Kauffman 2017-02-23 09:15:48 -05:00 • committed by GitHub
commit 7daeb610a2
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -18,6 +18,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
* *
### Fixed ### Fixed
* On load screen, always show Cancel link if a previous page is available
* When user hits "Watch," don't check balance if download already started * When user hits "Watch," don't check balance if download already started
* *
* *

2
js/component/load_screen.js
View file

@ -34,7 +34,7 @@ var LoadScreen = React.createClass({
<BusyMessage message={this.props.message} /> <BusyMessage message={this.props.message} />
</h3> </h3>
{this.props.isWarning ? <Icon icon="icon-warning" /> : null} <span className={'load-screen__details ' + (this.props.isWarning ? 'load-screen__details--warning' : '')}>{this.props.details}</span> {this.props.isWarning ? <Icon icon="icon-warning" /> : null} <span className={'load-screen__details ' + (this.props.isWarning ? 'load-screen__details--warning' : '')}>{this.props.details}</span>
{this.props.isWarning {window.history.length > 1
? <div><Link label="Cancel" onClick={this.handleCancelClick} className='load-screen__cancel-link button-text' /></div> ? <div><Link label="Cancel" onClick={this.handleCancelClick} className='load-screen__cancel-link button-text' /></div>
: null} : null}
</div> </div>