extern/mediacms
1
0
Fork 0
mirror of https://github.com/mediacms-io/mediacms.git synced 2025-02-16 18:30:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed event handler for displaying comments and adding markers to the timeline.

Browse Source 
https://github.com/mediacms-io/mediacms/issues/694
This commit is contained in:
jp-rad 2023-01-30 11:56:25 +00:00
parent 30cf5d7176
commit ab75017f2c
1 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
frontend/src/static/js/components/comments/Comments.jsx
View File

@ -422,37 +422,51 @@ const CommentsListHeader = ({ commentsLength }) => {
export default function CommentsList(props) { export default function CommentsList(props) {
const [mediaId, setMediaId] = useState(MediaPageStore.get('media-id')); const [mediaId, setMediaId] = useState(MediaPageStore.get('media-id'));
const [comments, setComments] = useState( const [comments, setComments] = useState([]);
MemberContext._currentValue.can.readComment ? MediaPageStore.get('media-comments') : []
);
const [displayComments, setDisplayComments] = useState(false); const [displayComments, setDisplayComments] = useState(false);
function onCommentsLoad() { function retrieveComments() {
const retrievedComments = [...MediaPageStore.get('media-comments')]; const retrievedComments = MemberContext._currentValue.can.readComment ? [...MediaPageStore.get('media-comments')] : [];
const video = videojs('vjs_video_3'); const video = videojs('vjs_video_3');
if (MediaCMS.features.media.actions.timestampTimebar)
{
video.markers.removeAll();
}
retrievedComments.forEach(comment => {
comment.sanitizedText = comment.text;
});
if (MediaCMS.features.media.actions.comment_mention === true)
{
retrievedComments.forEach(comment => {
comment.sanitizedText = setMentions(comment.sanitizedText);
});
}
retrievedComments.forEach(comment => {
comment.sanitizedText = setTimestampAnchorsAndMarkers(comment.sanitizedText, video);
});
setComments(retrievedComments);
}
function onCommentsLoad() {
const video = videojs('vjs_video_3');
if (MediaCMS.features.media.actions.timestampTimebar) if (MediaCMS.features.media.actions.timestampTimebar)
{ {
enableMarkers(video); enableMarkers(video);
} }
if (MediaCMS.features.media.actions.comment_mention === true) video.one('loadeddata', () => {
{
retrievedComments.forEach(comment => {
comment.text = setMentions(comment.text);
});
}
video.one('loadedmetadata', () => {
retrievedComments.forEach(comment => {
comment.text = setTimestampAnchorsAndMarkers(comment.text, video);
});
displayCommentsRelatedAlert(); displayCommentsRelatedAlert();
setComments([...retrievedComments]); retrieveComments();
}); });
setComments([...retrievedComments]);
retrieveComments();
} }
function setMentions(text) function setMentions(text)
@ -489,7 +503,7 @@ export default function CommentsList(props) {
} }
function onCommentSubmit(commentId) { function onCommentSubmit(commentId) {
onCommentsLoad(); retrieveComments();
// FIXME: Without delay creates conflict [ Uncaught Error: Dispatch.dispatch(...): Cannot dispatch in the middle of a dispatch. ]. // FIXME: Without delay creates conflict [ Uncaught Error: Dispatch.dispatch(...): Cannot dispatch in the middle of a dispatch. ].
setTimeout(() => PageActions.addNotification(commentsText.ucfirstSingle + ' added', 'commentSubmit'), 100); setTimeout(() => PageActions.addNotification(commentsText.ucfirstSingle + ' added', 'commentSubmit'), 100);
} }
@ -503,7 +517,7 @@ export default function CommentsList(props) {
} }
function onCommentDelete(commentId) { function onCommentDelete(commentId) {
onCommentsLoad(); retrieveComments();
// FIXME: Without delay creates conflict [ Uncaught Error: Dispatch.dispatch(...): Cannot dispatch in the middle of a dispatch. ]. // FIXME: Without delay creates conflict [ Uncaught Error: Dispatch.dispatch(...): Cannot dispatch in the middle of a dispatch. ].
setTimeout(() => PageActions.addNotification(commentsText.ucfirstSingle + ' removed', 'commentDelete'), 100); setTimeout(() => PageActions.addNotification(commentsText.ucfirstSingle + ' removed', 'commentDelete'), 100);
} }
@ -554,7 +568,7 @@ export default function CommentsList(props) {
key={c.uid} key={c.uid}
comment_id={c.uid} comment_id={c.uid}
media_id={mediaId} media_id={mediaId}
text={c.text} text={c.sanitizedText}
author_name={c.author_name} author_name={c.author_name}
author_link={c.author_profile} author_link={c.author_profile}
author_thumb={SiteContext._currentValue.url + '/' + c.author_thumbnail_url.replace(/^\//g, '')} author_thumb={SiteContext._currentValue.url + '/' + c.author_thumbnail_url.replace(/^\//g, '')}