Random fixes #2729

Merged
neb-b merged 12 commits from fixes into master 2019-08-15 05:11:48 +02:00
9 changed files with 29 additions and 10 deletions
Showing only changes of commit c20f491457 - Show all commits

View file

@ -125,7 +125,7 @@
"jsmediatags": "^3.8.1", "jsmediatags": "^3.8.1",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#4e093983eaf3d9e7513119657d731b808ead74a6", "lbry-redux": "lbryio/lbry-redux#1bd625f0c6e9e36d14eb0c520a3eb99f9600705d",
"lbryinc": "lbryio/lbryinc#1ce266b3c52654190b955e9c869b8e302aa5c585", "lbryinc": "lbryio/lbryinc#1ce266b3c52654190b955e9c869b8e302aa5c585",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",

View file

@ -25,7 +25,7 @@ class IconComponent extends React.PureComponent<Props> {
case ICONS.FEATURED: case ICONS.FEATURED:
return __('Featured content. Earn rewards for watching.'); return __('Featured content. Earn rewards for watching.');
case ICONS.DOWNLOAD: case ICONS.DOWNLOAD:
return __('This file is downloaded.'); return __('This file is in your library.');
case ICONS.SUBSCRIBE: case ICONS.SUBSCRIBE:
return __('You are subscribed to this channel.'); return __('You are subscribed to this channel.');
case ICONS.SETTINGS: case ICONS.SETTINGS:

View file

@ -77,6 +77,7 @@ class FileDetails extends PureComponent<Props> {
{': '} {': '}
<Button <Button
button="link" button="link"
className="button--download-link"
onClick={() => { onClick={() => {
if (downloadPath) { if (downloadPath) {
openFolder(downloadPath); openFolder(downloadPath);

View file

@ -1,12 +1,12 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { makeSelectFileInfoForUri, makeSelectClaimIsMine } from 'lbry-redux'; import { makeSelectFilePartlyDownloaded, makeSelectClaimIsMine } from 'lbry-redux';
import { selectRewardContentClaimIds } from 'lbryinc'; import { selectRewardContentClaimIds } from 'lbryinc';
import { makeSelectIsSubscribed, makeSelectIsNew } from 'redux/selectors/subscriptions'; import { makeSelectIsSubscribed, makeSelectIsNew } from 'redux/selectors/subscriptions';
import FileProperties from './view'; import FileProperties from './view';
const select = (state, props) => ({ const select = (state, props) => ({
rewardedContentClaimIds: selectRewardContentClaimIds(state, props), rewardedContentClaimIds: selectRewardContentClaimIds(state, props),
downloaded: !!makeSelectFileInfoForUri(props.uri)(state), downloaded: makeSelectFilePartlyDownloaded(props.uri)(state),
isSubscribed: makeSelectIsSubscribed(props.uri)(state), isSubscribed: makeSelectIsSubscribed(props.uri)(state),
isNew: makeSelectIsNew(props.uri)(state), isNew: makeSelectIsNew(props.uri)(state),
claimIsMine: makeSelectClaimIsMine(props.uri)(state), claimIsMine: makeSelectClaimIsMine(props.uri)(state),

View file

@ -266,7 +266,11 @@ export const makeSelectIsSubscribed = uri =>
} }
// If we couldn't get a channel uri from the claim uri, the uri passed in might be a channel already // If we couldn't get a channel uri from the claim uri, the uri passed in might be a channel already
const { isChannel } = parseURI(uri); let isChannel;
try {
({ isChannel } = parseURI(uri));
} catch (e) {}
if (isChannel) { if (isChannel) {
const uriWithPrefix = uri.startsWith('lbry://') ? uri : `lbry://${uri}`; const uriWithPrefix = uri.startsWith('lbry://') ? uri : `lbry://${uri}`;
return subscriptions.some(sub => sub.uri === uriWithPrefix); return subscriptions.some(sub => sub.uri === uriWithPrefix);

View file

@ -94,6 +94,16 @@
align-items: flex-start; align-items: flex-start;
} }
// Quick fix because this is a pain
// There is something weird with wrapping buttons. Some places we want to wrap and others we want to ellips
kauffj commented 2019-08-15 00:30:46 +02:00 (Migrated from github.com)
Review

Good job noting why the rules are being broken so a future dev and/or future you can understand

Good job noting why the rules are being broken so a future dev and/or future you can understand
// Probably requires some nested style cleanup
.button--download-link {
.button__label {
white-space: normal;
text-align: left;
}
}
.button__content { .button__content {
display: flex; display: flex;
align-items: center; align-items: center;

View file

@ -23,9 +23,6 @@
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
// display: flex;
// flex-direction: column;
// justify-content: space-between;
} }
.content__wrapper--floating { .content__wrapper--floating {

View file

@ -95,4 +95,11 @@
.vjs-big-play-button { .vjs-big-play-button {
display: none; display: none;
} }
.vjs-modal-dialog .vjs-modal-dialog-content {
position: relative;
padding-top: 5rem;
// Make sure no videojs message interferes with overlaying buttons
pointer-events: none;
}
} }

View file

@ -6762,9 +6762,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
yargs "^13.2.2" yargs "^13.2.2"
zstd-codec "^0.1.1" zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#4e093983eaf3d9e7513119657d731b808ead74a6: lbry-redux@lbryio/lbry-redux#1bd625f0c6e9e36d14eb0c520a3eb99f9600705d:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/4e093983eaf3d9e7513119657d731b808ead74a6" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/1bd625f0c6e9e36d14eb0c520a3eb99f9600705d"
dependencies: dependencies:
mime "^2.4.4" mime "^2.4.4"
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"