scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 02:56:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2979 from LLK/develop

Browse source 
Update release branch to bring in last weeks unreleased changes
This commit is contained in:
Paul Kaplan 2019-05-16 08:56:29 -04:00 committed by GitHub
commit 02419f9d18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/views/preview/presentation.jsx
View file

@ -367,6 +367,7 @@ const PreviewPresentation = ({
addToStudioOpen={addToStudioOpen} addToStudioOpen={addToStudioOpen}
canReport={canReport} canReport={canReport}
isAdmin={isAdmin} isAdmin={isAdmin}
isShared={isShared}
projectInfo={projectInfo} projectInfo={projectInfo}
reportOpen={reportOpen} reportOpen={reportOpen}
shareDate={shareDate} shareDate={shareDate}
@ -515,6 +516,7 @@ const PreviewPresentation = ({
canAddToStudio={canAddToStudio} canAddToStudio={canAddToStudio}
canReport={canReport} canReport={canReport}
isAdmin={isAdmin} isAdmin={isAdmin}
isShared={isShared}
projectInfo={projectInfo} projectInfo={projectInfo}
reportOpen={reportOpen} reportOpen={reportOpen}
shareDate={shareDate} shareDate={shareDate}

32
src/views/preview/subactions.jsx
View file

@ -50,19 +50,24 @@ const Subactions = props => (
)} )}
</React.Fragment> </React.Fragment>
} }
<Button {/* only show copy link button, modal if project is shared */}
className="action-button copy-link-button" {props.isShared && props.projectInfo && props.projectInfo.id && (
onClick={props.onSocialClicked} <React.Fragment>
> <Button
<FormattedMessage id="general.copyLink" /> className="action-button copy-link-button"
</Button> onClick={props.onSocialClicked}
{props.socialOpen && props.projectInfo && props.projectInfo.id && ( >
<SocialModal <FormattedMessage id="general.copyLink" />
isOpen </Button>
key="social-modal" {props.socialOpen && (
projectId={props.projectInfo && props.projectInfo.id} <SocialModal
onRequestClose={props.onSocialClosed} isOpen
/> key="social-modal"
projectId={props.projectInfo && props.projectInfo.id}
onRequestClose={props.onSocialClosed}
/>
)}
</React.Fragment>
)} )}
{(props.canReport) && {(props.canReport) &&
<React.Fragment> <React.Fragment>
@ -93,6 +98,7 @@ Subactions.propTypes = {
canAddToStudio: PropTypes.bool, canAddToStudio: PropTypes.bool,
canReport: PropTypes.bool, canReport: PropTypes.bool,
isAdmin: PropTypes.bool, isAdmin: PropTypes.bool,
isShared: PropTypes.bool,
onAddToStudioClicked: PropTypes.func, onAddToStudioClicked: PropTypes.func,
onAddToStudioClosed: PropTypes.func, onAddToStudioClosed: PropTypes.func,
onReportClicked: PropTypes.func.isRequired, onReportClicked: PropTypes.func.isRequired,