general player fixes
This commit is contained in:
parent
00e03ff6be
commit
c5ab8e1f20
7 changed files with 13 additions and 13 deletions
|
@ -125,7 +125,7 @@
|
|||
"jsmediatags": "^3.8.1",
|
||||
"json-loader": "^0.5.4",
|
||||
"lbry-format": "https://github.com/lbryio/lbry-format.git",
|
||||
"lbry-redux": "lbryio/lbry-redux#58bbdb9a2e537b3994d545ede120d070a7b41ee5",
|
||||
"lbry-redux": "lbryio/lbry-redux#4e093983eaf3d9e7513119657d731b808ead74a6",
|
||||
"lbryinc": "lbryio/lbryinc#a93596c51c8fb0a226cb84df04c26a6bb60a45fb",
|
||||
"lint-staged": "^7.0.2",
|
||||
"localforage": "^1.7.1",
|
||||
|
|
|
@ -40,7 +40,7 @@ const analytics: Analytics = {
|
|||
// @endif
|
||||
},
|
||||
apiLogView: (uri, outpoint, claimId, timeToStart) => {
|
||||
if (analyticsEnabled) {
|
||||
if (analyticsEnabled && isProduction) {
|
||||
const params: {
|
||||
uri: string,
|
||||
outpoint: string,
|
||||
|
|
|
@ -23,9 +23,7 @@ function FileDownloadLink(props: Props) {
|
|||
if (loading || downloading) {
|
||||
const progress = fileInfo && fileInfo.written_bytes > 0 ? (fileInfo.written_bytes / fileInfo.total_bytes) * 100 : 0;
|
||||
const label =
|
||||
fileInfo && fileInfo.written_bytes > 0
|
||||
? __('Downloading: ') + progress.toFixed(0) + __('% complete')
|
||||
: __('Connecting...');
|
||||
fileInfo && fileInfo.written_bytes > 0 ? progress.toFixed(0) + __('% downloaded') : __('Connecting...');
|
||||
|
||||
return <span>{label}</span>;
|
||||
}
|
||||
|
|
|
@ -54,7 +54,7 @@ function ModalRemoveFile(props: Props) {
|
|||
button="primary"
|
||||
label={__('OK')}
|
||||
disabled={!deleteChecked && !abandonChecked}
|
||||
onClick={() => deleteFile(outpoint || '', deleteChecked, abandonChecked)}
|
||||
onClick={() => deleteFile(outpoint || '', deleteChecked, claimIsMine ? abandonChecked : false)}
|
||||
/>
|
||||
<Button button="link" label={__('Cancel')} onClick={closeModal} />
|
||||
</div>
|
||||
|
|
|
@ -5,6 +5,7 @@ import { shell } from 'electron';
|
|||
import { Lbry, batchActions, doAbandonClaim, selectMyClaimsOutpoints } from 'lbry-redux';
|
||||
import { doHideModal } from 'redux/actions/app';
|
||||
import { goBack } from 'connected-react-router';
|
||||
import { doSetPlayingUri } from 'redux/actions/content';
|
||||
|
||||
export function doOpenFileInFolder(path) {
|
||||
return () => {
|
||||
|
@ -52,7 +53,9 @@ export function doDeleteFileAndMaybeGoBack(fileInfo, deleteFromComputer, abandon
|
|||
const actions = [];
|
||||
actions.push(doHideModal());
|
||||
actions.push(doDeleteFile(fileInfo, deleteFromComputer, abandonClaim));
|
||||
actions.push(doSetPlayingUri(null));
|
||||
dispatch(batchActions(...actions));
|
||||
|
||||
if (abandonClaim) {
|
||||
dispatch(goBack());
|
||||
}
|
||||
|
|
|
@ -23,6 +23,9 @@
|
|||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
// display: flex;
|
||||
// flex-direction: column;
|
||||
// justify-content: space-between;
|
||||
}
|
||||
|
||||
.content__wrapper--floating {
|
||||
|
@ -85,11 +88,7 @@
|
|||
}
|
||||
|
||||
.content__loading {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
|
|
|
@ -6762,9 +6762,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
|
|||
yargs "^13.2.2"
|
||||
zstd-codec "^0.1.1"
|
||||
|
||||
lbry-redux@lbryio/lbry-redux#58bbdb9a2e537b3994d545ede120d070a7b41ee5:
|
||||
lbry-redux@lbryio/lbry-redux#4e093983eaf3d9e7513119657d731b808ead74a6:
|
||||
version "0.0.1"
|
||||
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/58bbdb9a2e537b3994d545ede120d070a7b41ee5"
|
||||
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/4e093983eaf3d9e7513119657d731b808ead74a6"
|
||||
dependencies:
|
||||
mime "^2.4.4"
|
||||
proxy-polyfill "0.1.6"
|
||||
|
|
Loading…
Reference in a new issue