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

Merge branch 'master' into patch-2

Browse source
This commit is contained in:
Baltazar Gomez 2017-08-28 21:40:45 -06:00 committed by GitHub
commit 49ab36dd1e
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -33,6 +33,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
* Fixed rendering of small prices (#461) * Fixed rendering of small prices (#461)
* Fixed incorrect URI in Downloads/Published page (#460) * Fixed incorrect URI in Downloads/Published page (#460)
* Fixed backward / forward logic of history (#499) * Fixed backward / forward logic of history (#499)
* Fixed menu bug (#503)
### Deprecated ### Deprecated
* *

11
ui/js/component/fileList/view.jsx
View file

@ -51,6 +51,14 @@ class FileList extends React.PureComponent {
}; };
} }
getChannelSignature(fileInfo) {
if (fileInfo.value) {
return fileInfo.value.publisherSignature.certificateId;
} else {
return fileInfo.metadata.publisherSignature.certificateId;
}
}
handleSortChanged(event) { handleSortChanged(event) {
this.setState({ this.setState({
sortBy: event.target.value, sortBy: event.target.value,
@ -68,8 +76,7 @@ class FileList extends React.PureComponent {
if (fileInfo.channel_name) { if (fileInfo.channel_name) {
uriParams.channelName = fileInfo.channel_name; uriParams.channelName = fileInfo.channel_name;
uriParams.contentName = fileInfo.name; uriParams.contentName = fileInfo.name;
// The following can be done as certificateID of a claim is nothing but the claimID of the channel. uriParams.claimId = this.getChannelSignature(fileInfo);
uriParams.claimId = fileInfo.value.publisherSignature.certificateId;
} else { } else {
uriParams.claimId = fileInfo.claim_id; uriParams.claimId = fileInfo.claim_id;
uriParams.name = fileInfo.name; uriParams.name = fileInfo.name;

5
ui/js/component/menu.js
View file

@ -69,7 +69,8 @@ export class DropDownMenu extends React.PureComponent {
}); });
} }
handleWindowClick(e) { /*this will force "this" to always be the class, even when passed to an event listener*/
handleWindowClick = e => {
if ( if (
this.state.menuOpen && this.state.menuOpen &&
(!this._menuDiv || !this._menuDiv.contains(e.target)) (!this._menuDiv || !this._menuDiv.contains(e.target))
@ -78,7 +79,7 @@ export class DropDownMenu extends React.PureComponent {
menuOpen: false, menuOpen: false,
}); });
} }
} };
render() { render() {
if (!this.state.menuOpen && this._isWindowClickBound) { if (!this.state.menuOpen && this._isWindowClickBound) {