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

clean up

Browse source
This commit is contained in:
picklesrus 2021-06-07 15:31:20 -04:00
parent 993dd36aa5
commit 1afbe4ad79
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -602,8 +602,9 @@ const PreviewPresentation = ({
author={comment.author}
canDelete={canDeleteComments}
canDeleteWithoutConfirm={isAdmin}
canReply=
{isLoggedIn && projectInfo.comments_allowed && isShared}
canReply={
isLoggedIn && projectInfo.comments_allowed && isShared
}
canReport={isLoggedIn}
canRestore={canRestoreComments}
content={comment.content}
@ -615,7 +616,9 @@ const PreviewPresentation = ({
moreRepliesToLoad={comment.moreRepliesToLoad}
parentId={comment.parent_id}
postURI={`/proxy/comments/project/${projectId}`}
replies={replies && replies[comment.id] ? replies[comment.id] : []}
replies={
replies && replies[comment.id] ? replies[comment.id] : []
}
visibility={comment.visibility}
onAddComment={onAddComment}
onDelete={onDeleteComment}

4
src/views/preview/project-view.jsx
View file

@ -903,6 +903,7 @@ Preview.propTypes = {
isAdmin: PropTypes.bool,
isEditable: PropTypes.bool,
isLoggedIn: PropTypes.bool,
isProjectCommentsGloballyEnabled: PropTypes.bool,
isNewScratcher: PropTypes.bool,
isScratcher: PropTypes.bool,
isShared: PropTypes.bool,
@ -983,8 +984,7 @@ const mapStateToProps = state => {
const isEditable = isLoggedIn &&
(authorUsername === state.session.session.user.username ||
state.permissions.admin === true);
const haveSession = state.session.session.flags;
const areCommentsOn = haveSession && selectProjectCommentsGloballyEnabled(state);
const areCommentsOn = state.session.session.flags && selectProjectCommentsGloballyEnabled(state);
// if we don't have projectInfo, assume it's shared until we know otherwise