wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-11 12:51:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into query-composition

Browse Source 
Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-embed-stream/src/Stream.js
This commit is contained in:
Chi Vinh Le
2017-04-26 01:22:14 +07:00
parent 9d7524644c 5db9ea6520
commit eb9846ba40
14 changed files with 174 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-embed-stream/src/components/Stream.js
+8 -2
View File
@@ -91,7 +91,8 @@ class Stream extends React.Component {
premod={asset.settings.moderation}
isReply={false}
authorId={user.id}
charCount={asset.settings.charCountEnable && asset.settings.charCount} />
charCountEnable={asset.settings.charCountEnable}
maxCharCount={asset.settings.charCount} />
: null
}
</RestrictedContent>
@@ -125,7 +126,10 @@ class Stream extends React.Component {
key={highlightedComment.id}
commentIsIgnored={commentIsIgnored}
reactKey={highlightedComment.id}
comment={highlightedComment} />
comment={highlightedComment}
charCountEnable={asset.settings.charCountEnable}
maxCharCount={asset.settings.charCount}
/>
: <div>
<NewCount
commentCount={asset.commentCount}
@@ -167,6 +171,8 @@ class Stream extends React.Component {
reactKey={comment.id}
comment={comment}
pluginProps={pluginProps}
charCountEnable={asset.settings.charCountEnable}
maxCharCount={asset.settings.charCount}
/>
)
}