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

Merge pull request #1665 from lbryio/btzr-patch

Browse source 
Fix incorrect page designation
This commit is contained in:
Sean Yesmunt 2018-06-21 14:33:16 -04:00 • committed by GitHub
commit 0cd188014c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CHANGELOG.md
View file

@ -22,7 +22,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* Pre-fill publish URL after clicking "Put something here" link ([#1303](https://github.com/lbryio/lbry-app/pull/1303)) * Pre-fill publish URL after clicking "Put something here" link ([#1303](https://github.com/lbryio/lbry-app/pull/1303))
* Danger JS to automate code reviews ([#1289](https://github.com/lbryio/lbry-app/pull/1289)) * Danger JS to automate code reviews ([#1289](https://github.com/lbryio/lbry-app/pull/1289))
* 'Go to page' input on channel pagination ([#1166](https://github.com/lbryio/lbry-app/pull/1166)) * 'Go to page' input on channel pagination ([#1166](https://github.com/lbryio/lbry-app/pull/1166))
### Changed ### Changed
* LBRY App UI Redesign 5.0 implemented including new theme, layout, and improved search mechanics ([#870](https://github.com/lbryio/lbry-app/pull/870)) and ([#1173](https://github.com/lbryio/lbry-app/pull/1173)) * LBRY App UI Redesign 5.0 implemented including new theme, layout, and improved search mechanics ([#870](https://github.com/lbryio/lbry-app/pull/870)) and ([#1173](https://github.com/lbryio/lbry-app/pull/1173))
* Adapted dark mode to redesign ([#1269](https://github.com/lbryio/lbry-app/pull/1269)) * Adapted dark mode to redesign ([#1269](https://github.com/lbryio/lbry-app/pull/1269))
@ -32,7 +32,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* Made font in price badge larger ([#1420](https://github.com/lbryio/lbry-app/pull/1420)) * Made font in price badge larger ([#1420](https://github.com/lbryio/lbry-app/pull/1420))
* Move rewards logic to interal api ([#1509](https://github.com/lbryio/lbry-app/pull/1509)) * Move rewards logic to interal api ([#1509](https://github.com/lbryio/lbry-app/pull/1509))
* Narrative about Feature Request on Help Page and Report Page ([#1551](https://github.com/lbryio/lbry-app/pull/1551)) * Narrative about Feature Request on Help Page and Report Page ([#1551](https://github.com/lbryio/lbry-app/pull/1551))
### Fixed ### Fixed
* Create channel and publish immediately([#1481](https://github.com/lbryio/lbry-app/pull/1481)) * Create channel and publish immediately([#1481](https://github.com/lbryio/lbry-app/pull/1481))
@ -57,9 +57,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* Incorrect markdown preview on url with parentheses ([#1570](https://github.com/lbryio/lbry-app/issues/1570)) * Incorrect markdown preview on url with parentheses ([#1570](https://github.com/lbryio/lbry-app/issues/1570))
* Fix Linux upgrade path and add manual installation note ([#1606](https://github.com/lbryio/lbry-app/issues/1606)) * Fix Linux upgrade path and add manual installation note ([#1606](https://github.com/lbryio/lbry-app/issues/1606))
* Fix can type in unfocused fields while publishing without selecting file ([#1456](https://github.com/lbryio/lbry-app/issues/1456)) * Fix can type in unfocused fields while publishing without selecting file ([#1456](https://github.com/lbryio/lbry-app/issues/1456))
* Fix navigation button resulting incorrect page designation ([#1502](https://github.com/lbryio/lbry-app/issues/1502))
## [0.21.6] - 2018-06-05 ## [0.21.6] - 2018-06-05
### Fixed ### Fixed
@ -80,9 +80,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Changed ### Changed
* Rewards now rely on API data ([#1329](https://github.com/lbryio/lbry-app/issues/1329)) * Rewards now rely on API data ([#1329](https://github.com/lbryio/lbry-app/issues/1329))
## [0.21.4] - 2018-05-10 ## [0.21.4] - 2018-05-10
### Changed ### Changed

5
src/renderer/page/channel/view.jsx
View file

@ -66,7 +66,7 @@ class ChannelPage extends React.PureComponent<Props> {
render() { render() {
const { fetching, claimsInChannel, claim, page, totalPages } = this.props; const { fetching, claimsInChannel, claim, page, totalPages } = this.props;
const { name, permanent_url: permanentUrl, claim_id: claimId } = claim; const { name, permanent_url: permanentUrl, claim_id: claimId } = claim;
const currentPage = parseInt((page || 1) - 1, 10);
let contentList; let contentList;
if (fetching) { if (fetching) {
contentList = <BusyIndicator message={__('Fetching content')} />; contentList = <BusyIndicator message={__('Fetching content')} />;
@ -104,7 +104,8 @@ class ChannelPage extends React.PureComponent<Props> {
breakClassName="pagination__item pagination__item--break" breakClassName="pagination__item pagination__item--break"
marginPagesDisplayed={2} marginPagesDisplayed={2}
onPageChange={e => this.changePage(e.selected + 1)} onPageChange={e => this.changePage(e.selected + 1)}
initialPage={parseInt(page - 1, 10)} forcePage={currentPage}
initialPage={currentPage}
containerClassName="pagination" containerClassName="pagination"
/> />

8
src/renderer/scss/component/_pagination.scss
View file

@ -9,12 +9,12 @@
line-height: $spacing-vertical * 1.5; line-height: $spacing-vertical * 1.5;
height: $spacing-vertical * 1.5; height: $spacing-vertical * 1.5;
border-radius: 2px; border-radius: 2px;
&:not(.pagination__item--selected):hover {
&:not(.pagination__item--selected):not(.pagination__item--break):not(.disabled):hover {
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
> a { cursor: pointer;
cursor: hand;
}
} }
> a { > a {
display: inline-block; display: inline-block;
padding: 0 $spacing-vertical * 2 / 3; padding: 0 $spacing-vertical * 2 / 3;