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

fix rebase

Browse source
This commit is contained in:
zeppi 2021-11-13 16:15:29 -05:00
parent bfffc53a94
commit 424308ef09
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ui/component/downloadProgress/index.js
View file

@ -1,7 +1,8 @@
import { connect } from 'react-redux';
import DownloadProgress from './view';
import { doSetPlayingUri, doStopDownload, doContinueDownloading, doPurchaseUriWrapper } from 'redux/actions/content';
import { selectFileInfosByOutpoint, SETTINGS } from 'lbry-redux';
import * as SETTINGS from 'constants/settings';
import { selectFileInfosByOutpoint } from 'redux/selectors/file_info';
import { selectPrimaryUri, selectPlayingUri } from 'redux/selectors/content';
import { makeSelectClientSetting } from 'redux/selectors/settings';

2
ui/component/downloadProgress/view.jsx
View file

@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
import { shell } from 'electron';
import Button from 'component/button';
import * as ICONS from 'constants/icons';
import { buildURI } from 'lbry-redux';
import { buildURI } from 'util/lbryURI';
import { formatBytes } from 'util/format-bytes';
import { areEqual, removeItem } from 'util/array';
import loadingIcon from '../../../static/img/white_loading.gif';

15
ui/util/remark-lbry.js
View file

@ -26,21 +26,6 @@ function handlePunctuation(value) {
return punctuationIndex ? value.substring(0, punctuationIndex) : value;
}
function handlePunctuation(value) {
const modifierIndex =
(value.indexOf(':') >= 0 && value.indexOf(':')) || (value.indexOf('#') >= 0 && value.indexOf('#'));
let punctuationIndex;
punctuationMarks.some((p) => {
if (modifierIndex) {
punctuationIndex = value.indexOf(p, modifierIndex + 1) >= 0 && value.indexOf(p, modifierIndex + 1);
}
return punctuationIndex;
});
return punctuationIndex ? value.substring(0, punctuationIndex) : value;
}
// Find channel mention
function locateMention(value, fromIndex) {
const index = value.indexOf(mentionToken, fromIndex);