diff --git a/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.js b/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.js index 421f346601a..f9f19aee03d 100644 --- a/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.js +++ b/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.js @@ -1,8 +1,6 @@ import { action } from "@ember/object"; import showModal from "discourse/lib/show-modal"; -import discourseLater from "discourse-common/lib/later"; -import isElementInViewport from "discourse/lib/is-element-in-viewport"; -import discourseComputed, { on } from "discourse-common/utils/decorators"; +import discourseComputed from "discourse-common/utils/decorators"; import I18n from "I18n"; import Component from "@ember/component"; import { inject as service } from "@ember/service"; @@ -31,23 +29,13 @@ export default Component.extend({ return `dismiss-new-${position}`; }, - @discourseComputed( - "position", - "isOtherDismissUnreadButtonVisible", - "isOtherDismissNewButtonVisible" - ) - showBasedOnPosition( - position, - isOtherDismissUnreadButtonVisible, - isOtherDismissNewButtonVisible - ) { + @discourseComputed("position", "model.topics.length") + showBasedOnPosition(position, topicCount) { if (position !== "top") { return true; } - return !( - isOtherDismissUnreadButtonVisible || isOtherDismissNewButtonVisible - ); + return topicCount > 5; }, @discourseComputed("selectedTopics.length") @@ -72,28 +60,6 @@ export default Component.extend({ }); }, - // we want to only render the Dismiss... button at the top of the - // page if the user cannot see the bottom Dismiss... button based on their - // viewport, or if too many topics fill the page - @on("didInsertElement") - _determineOtherDismissVisibility() { - discourseLater(() => { - if (this.position === "top") { - this.set( - "isOtherDismissUnreadButtonVisible", - isElementInViewport(document.getElementById("dismiss-topics-bottom")) - ); - this.set( - "isOtherDismissNewButtonVisible", - isElementInViewport(document.getElementById("dismiss-new-bottom")) - ); - } else { - this.set("isOtherDismissUnreadButtonVisible", true); - this.set("isOtherDismissNewButtonVisible", true); - } - }); - }, - @action dismissReadPosts() { let dismissTitle = "topics.bulk.dismiss_read";