diff --git a/resources/assets/components/groups/CreateGroup.vue b/resources/assets/components/groups/CreateGroup.vue index 7459275f4..55a857ab8 100644 --- a/resources/assets/components/groups/CreateGroup.vue +++ b/resources/assets/components/groups/CreateGroup.vue @@ -209,8 +209,8 @@ permissionChecked: false, membershipCategories: [ { key: 'Public', value: 'public' }, - { key: 'Private', value: 'private' }, - { key: 'Local', value: 'local' }, + // { key: 'Private', value: 'private' }, + // { key: 'Local', value: 'local' }, ], } }, diff --git a/resources/assets/components/groups/partials/CommentDrawer.vue b/resources/assets/components/groups/partials/CommentDrawer.vue index cd6631df3..e7df4a6eb 100644 --- a/resources/assets/components/groups/partials/CommentDrawer.vue +++ b/resources/assets/components/groups/partials/CommentDrawer.vue @@ -343,7 +343,8 @@ childReplyContent: null, postingChildComment: false, loadingChildComments: false, - replyChildMinId: undefined + replyChildMinId: undefined, + replyCursorId: null } }, @@ -584,6 +585,7 @@ } this.replyChildId = status.id; + this.replyCursorId = status.id this.replyChildIndex = index; if(!status.hasOwnProperty('replies_loaded') || !status.replies_loaded) { @@ -591,7 +593,9 @@ this.fetchChildReplies(status, index); }); } else { - + this.$nextTick(() => { + this.fetchChildReplies(status, index); + }); } }, @@ -600,7 +604,7 @@ params: { gid: this.groupId, sid: status.id, - cid: 1, + cid: this.replyCursorId, limit: 3 } }).then(res => { diff --git a/resources/assets/components/groups/partials/GroupStatus.vue b/resources/assets/components/groups/partials/GroupStatus.vue index 439fd03b4..fe61c892e 100644 --- a/resources/assets/components/groups/partials/GroupStatus.vue +++ b/resources/assets/components/groups/partials/GroupStatus.vue @@ -17,6 +17,7 @@ :profile="profile" :showGroupHeader="showGroupHeader" :showGroupChevron="showGroupChevron" + v-on:delete="statusDeleted" />
diff --git a/resources/assets/components/groups/partials/SelfFeed.vue b/resources/assets/components/groups/partials/SelfFeed.vue index 6663b4dfa..2fff5298d 100644 --- a/resources/assets/components/groups/partials/SelfFeed.vue +++ b/resources/assets/components/groups/partials/SelfFeed.vue @@ -1,63 +1,50 @@ diff --git a/resources/assets/components/groups/partials/Status/GroupHeader.vue b/resources/assets/components/groups/partials/Status/GroupHeader.vue index 1a782302a..966b16b92 100644 --- a/resources/assets/components/groups/partials/Status/GroupHeader.vue +++ b/resources/assets/components/groups/partials/Status/GroupHeader.vue @@ -110,12 +110,12 @@