github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 04:31:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: More events for filtered replies (#11511)

Browse Source
This commit is contained in:
Penar Musaraj 2020-12-16 12:11:01 -05:00 committed by GitHub
parent d1058f4e4c
commit 230fe0427e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/app/models/post-stream.js
View File

@ -251,12 +251,13 @@ export default RestModel.extend({
return this.refreshAndJumptoSecondVisible();
},
filterReplies(postNumber) {
filterReplies(postNumber, postId) {
this.cancelFilter();
this.set("filterRepliesToPostNumber", postNumber);
this.appEvents.trigger("post-stream:filter-replies", {
topic_id: this.get("topic.id"),
post_number: postNumber,
post_id: postId,
});
return this.refresh({ refreshInPlace: true }).then(() => {
const element = document.querySelector(`#post_${postNumber}`);

3
app/assets/javascripts/discourse/app/widgets/post-gap.js
View File

@ -29,6 +29,9 @@ export default createWidget("post-gap", {
args
).then(() => {
state.loading = false;
this.appEvents.trigger("post-stream:gap-expanded", {
post_id: this.model.id,
});
});
},
});

4
app/assets/javascripts/discourse/app/widgets/post-stream.js
View File

@ -175,6 +175,10 @@ createWidget("filter-show-all", {
click() {
this.sendWidgetAction("cancelFilter", this.attrs.streamFilters);
this.appEvents.trigger(
"post-stream:filter-show-all",
this.attrs.streamFilters
);
},
});

2
app/assets/javascripts/discourse/app/widgets/post.js
View File

@ -439,7 +439,7 @@ createWidget("post-contents", {
const controller = this.register.lookup("controller:topic");
post
.get("topic.postStream")
.filterReplies(this.attrs.post_number)
.filterReplies(post.post_number, post.id)
.then(() => {
controller.updateQueryParams();
});

2
app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js
View File

@ -320,7 +320,7 @@ module("Unit | Model | post-stream", function () {
"by default no replies are filtered"
);
postStream.filterReplies(3);
postStream.filterReplies(3, 2);
assert.equal(
postStream.get("filterRepliesToPostNumber"),
3,