From 779f57ce03bd4f0e9a5db14d5d1582f016db2447 Mon Sep 17 00:00:00 2001 From: edgeinfinity1 <133833590+edgeinfinity1@users.noreply.github.com> Date: Wed, 28 Feb 2024 21:58:24 +0800 Subject: [PATCH] Update StickiestModal.js --- js/src/forum/components/StickiestModal.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/js/src/forum/components/StickiestModal.js b/js/src/forum/components/StickiestModal.js index 93c4c51..1f8ca47 100644 --- a/js/src/forum/components/StickiestModal.js +++ b/js/src/forum/components/StickiestModal.js @@ -20,14 +20,20 @@ export default class StickiestModal extends Modal { const discussion = this.attrs.discussion; const discussionTags = discussion.tags(); - const stickyTags = Stream(discussion.stickyTags().filter((tag) => discussionTags.indexOf(tag) > -1) || []); + this.isSticky = Stream(discussion.isSticky() || false); this.isStickiest = Stream(discussion.isStickiest() || false); this.isTagSticky = Stream(discussion.isTagSticky() || false); - - if (stickyTags().length > 0) { - this.tagSlugs = sortTags(stickyTags()).map((tag) => tag.slug()); + console.log(this.isTagSticky); + if (this.isTagSticky == Stream(discussion.isTagSticky())) { + const stickyTags = Stream(discussion.stickyTags().filter((tag) => discussionTags.indexOf(tag) > -1) || []); + + if (stickyTags().length > 0) { + this.tagSlugs = sortTags(stickyTags()).map((tag) => tag.slug()); + } else { + this.tagSlugs = sortTags(discussionTags).map((tag) => tag.slug()); + } } else { this.tagSlugs = sortTags(discussionTags).map((tag) => tag.slug()); }