The_Great_Archive/RSNewWebUI
1
0
Fork 0
mirror of https://github.com/RetroShare/RSNewWebUI.git synced 2026-09-14 11:05:47 +05:00
Code Issues Packages Projects Releases Wiki Activity

reply structure and file download

Browse Source
This commit is contained in:
Sukhamjot Singh 2022-07-10 18:55:57 +05:30
parent b2fbdcc6c1
commit df8946432c
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webui-src/app/channels/channel.css
View File

@ -91,6 +91,7 @@ table.comments td {
word-wrap: break-word;
}
table.comments td:nth-child(2){
text-align: start;
border: 3px solid lightskyblue;
border-radius: 25px;

57
webui-src/app/channels/channel_view.js
View File

@ -4,6 +4,8 @@ const util = require('channels/channels_util');
const Data = util.Data;
const peopleUtil = require('people/people_util');
const sha1 = require('channels/sha1');
const fileUtil = require('files/files_util');
const fileDown = require('files/files_downloads');
const filesUploadHashes = {
// not a good practice, figure out a better way later.
@ -330,30 +332,32 @@ const AddComment = () => {
};
};
function DisplayComment() {
// No reliance on initialisation signature
return {
oninit: (v) => {
console.log(v.attrs.commentStruct.comment.mComment);
},
view: ({ attrs: { commentStruct, identity } }) => {
// Use component / vnode interface instead
view: ({ attrs: { commentStruct, identity, isReply } }) => {
const comment = commentStruct.comment;
let parMap = [];
if (Data.ParentCommentMap[comment.mMeta.mMsgId]) {
parMap = Array.from(Data.ParentCommentMap[comment.mMeta.mMsgId]);
} // console.log(parMap);
// console.log(Array.from(Data.ParentCommentMap[comment.mMeta.mMsgId]));
}
return [
m('tr', [
(parMap.length > 0)?m('td', m('i.fas.fa-angle-right', {
class: 'fa-rotate-' + (commentStruct.showReplies ? '90' : '0'),
style: 'margin-top:12px',
onclick: () => {
commentStruct.showReplies = !commentStruct.showReplies;
},
})):m('td', ''),
parMap.length > 0
? m(
'td',
m('i.fas.fa-angle-right', {
class: 'fa-rotate-' + (commentStruct.showReplies ? '90' : '0'),
style: 'margin-top:12px',
onclick: () => {
commentStruct.showReplies = !commentStruct.showReplies;
},
})
)
: m('td', ''),
m('td', comment.mComment),
m('td', { style: isReply ? 'position:relative;left:20px' : '' }, comment.mComment),
m(
'select[id=options]',
{
@ -408,22 +412,11 @@ function DisplayComment() {
m('td', comment.mDownVotes),
]),
commentStruct.showReplies &&
// Data.ParentCommentMap[comment.mMeta.mMsgId] &&
// Data.ParentCommentMap[comment.mMeta.mMsgId].forEach(
// (value) =>
parMap.map(
(value) =>
// console.log(value)
// Data.Comments[Data.ParentCommentMap[comment.mMeta.mMsgId][key].mMeta.mThreadId] &&
// Data.Comments[Data.ParentCommentMap[comment.mMeta.mMsgId][key].mMeta.mThreadId][
// Data.ParentCommentMap[comment.mMeta.mMsgId][key].mMeta.mMsgId
// ] &&
parMap.map((value) =>
m(DisplayComment, {
commentStruct:
Data.Comments[value.mMeta.mThreadId][
value.mMeta.mMsgId
],
commentStruct: Data.Comments[value.mMeta.mThreadId][value.mMeta.mMsgId],
identity,
isReply: true,
})
),
];
@ -505,6 +498,12 @@ const PostView = () => {
: ['Download', m('i.fas.fa-download')]
: 'Please Wait...'
),
fileDown.list[file.mHash] && m(fileUtil.File, {
info: fileDown.list[file.mHash],
direction: 'down',
transferred: fileDown.list[file.mHash].transfered.xint64,
parts: [],
})
])
)
)
@ -536,12 +535,12 @@ const PostView = () => {
Data.Comments[topComments[key].mMeta.mThreadId] &&
Data.Comments[topComments[key].mMeta.mThreadId][topComments[key].mMeta.mMsgId]
? m(DisplayComment, {
// Do not call DisplayComment as a function, invoke like a component
identity: ownId, // supply the input as named attributes
identity: ownId,
commentStruct:
Data.Comments[topComments[key].mMeta.mThreadId][
topComments[key].mMeta.mMsgId
],
isReply: false,
})
: ''
)