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

Open in desktop #6667

Closed
btzr-io wants to merge 13 commits from protocol into master
pull from: protocol
merge into: LBRYCommunity:master
Conversation 16 Commits 13 Files changed 6 +6 -4
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2f9278d5cc - Show all commits

6
ui/component/claimMenuList/view.jsx
View file

@ -9,6 +9,7 @@ import { Menu, MenuButton, MenuList, MenuItem } from '@reach/menu-button';
import Icon from 'component/common/icon'; import Icon from 'component/common/icon';
import { generateShareUrl, generateRssUrl, generateLbryContentUrl } from 'util/url'; import { generateShareUrl, generateRssUrl, generateLbryContentUrl } from 'util/url';
import { useHistory } from 'react-router'; import { useHistory } from 'react-router';
import { useIsMobile } from 'effects/use-screensize';
import { buildURI, parseURI, COLLECTIONS_CONSTS } from 'lbry-redux'; import { buildURI, parseURI, COLLECTIONS_CONSTS } from 'lbry-redux';
const SHARE_DOMAIN = SHARE_DOMAIN_URL || URL; const SHARE_DOMAIN = SHARE_DOMAIN_URL || URL;
@ -94,6 +95,7 @@ function ClaimMenuList(props: Props) {
editedCollection, editedCollection,
isAuthenticated, isAuthenticated,
} = props; } = props;
const isMobile = useIsMobile();
const incognitoClaim = contentChannelUri && !contentChannelUri.includes('@'); const incognitoClaim = contentChannelUri && !contentChannelUri.includes('@');
const isChannel = !incognitoClaim && !contentSigningChannel; const isChannel = !incognitoClaim && !contentSigningChannel;
const { channelName } = parseURI(contentChannelUri); const { channelName } = parseURI(contentChannelUri);
@ -230,7 +232,7 @@ function ClaimMenuList(props: Props) {
} }
function handleOpenInDesktop() { function handleOpenInDesktop() {
window.open(claim.permanent_url); window.open(claim.permanent_url, '_top');
} }
return ( return (
@ -407,7 +409,7 @@ function ClaimMenuList(props: Props) {
</MenuItem> </MenuItem>
)} )}
{IS_WEB && ( {IS_WEB && !isMobile && (
<MenuItem className="comment__menu-option" onSelect={handleOpenInDesktop}> <MenuItem className="comment__menu-option" onSelect={handleOpenInDesktop}>
<div className="menu__link"> <div className="menu__link">
<Icon aria-hidden icon={ICONS.DESKTOP} /> <Icon aria-hidden icon={ICONS.DESKTOP} />

4
ui/component/fileActions/view.jsx
View file

@ -114,7 +114,7 @@ function FileActions(props: Props) {
} }
function handleOpenInDesktop() { function handleOpenInDesktop() {
window.open(claim.permanent_url); window.open(claim.permanent_url, '_top');
} }
const lhsSection = ( const lhsSection = (
@ -192,7 +192,7 @@ function FileActions(props: Props) {
</MenuItem> </MenuItem>
)} )}
{/* @endif */} {/* @endif */}
{IS_WEB && ( {IS_WEB && !isMobile && (
<MenuItem className="comment__menu-option" onSelect={handleOpenInDesktop}> <MenuItem className="comment__menu-option" onSelect={handleOpenInDesktop}>
<div className="menu__link"> <div className="menu__link">
<Icon aria-hidden icon={ICONS.DESKTOP} /> <Icon aria-hidden icon={ICONS.DESKTOP} />