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

Merge branch 'master' into post-comment-no-alias

Browse Source
This commit is contained in:
Kim Gardner
2017-07-21 09:31:01 -04:00
committed by GitHub
parent 1733ab8690 316b0a8808
commit 8261c40c8d
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/talk-plugin-featured-comments/client/components/Tag.js
+1 -1
View File
@@ -6,7 +6,7 @@ import {isTagged} from 'plugin-api/beta/client/utils';
export default (props) => (
<span>
{
isTagged(props.comment.tags, 'FEATURED') && props.depth === 0 ? (
isTagged(props.comment.tags, 'FEATURED') ? (
<span className={styles.tag}>
{t('talk-plugin-featured-comments.featured')}
</span>
plugins/talk-plugin-featured-comments/client/containers/Comment.js
+14
View File
@@ -31,6 +31,20 @@ export default withFragments({
name
}
}
##
# TODO: Remove this when we have the IntrospectionFragmentMatcher.
# Currently without this loading more featured comments
# brings apollo into an inconsistent state.
action_summaries {
__typename
count
current_user {
id
}
}
##
user {
id
username
plugins/talk-plugin-featured-comments/client/containers/TabPane.js
+1 -1
View File
@@ -47,7 +47,7 @@ class TabPaneContainer extends React.Component {
}
const LOAD_MORE_QUERY = gql`
query CoralEmbedStream_LoadMoreComments($limit: Int = 5, $cursor: Date, $asset_id: ID, $sort: SORT_ORDER, $excludeIgnored: Boolean) {
query TalkFeaturedComments_LoadMoreComments($limit: Int = 5, $cursor: Date, $asset_id: ID, $sort: SORT_ORDER, $excludeIgnored: Boolean) {
comments(query: {limit: $limit, cursor: $cursor, tags: ["FEATURED"], asset_id: $asset_id, sort: $sort, excludeIgnored: $excludeIgnored}) {
nodes {
...${getDefinitionName(Comment.fragments.comment)}