From 4940d0ea199abd19b0f1987d735ea34be3ca1a05 Mon Sep 17 00:00:00 2001 From: Roman Rizzi Date: Thu, 14 Jul 2022 15:58:29 -0300 Subject: [PATCH] FIX: Ensure we won't render the connector if there are no ads (#148) --- assets/javascripts/discourse/components/ad-slot.js | 8 ++++---- .../after-topic-list-item/discourse-adplugin.js | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/javascripts/discourse/components/ad-slot.js b/assets/javascripts/discourse/components/ad-slot.js index 29ffb3d..9cfa966 100644 --- a/assets/javascripts/discourse/components/ad-slot.js +++ b/assets/javascripts/discourse/components/ad-slot.js @@ -99,8 +99,8 @@ export function slotContenders( site, siteSettings, placement, - postNumber, - indexNumber + indexNumber, + postNumber ) { let types = []; const houseAds = site.get("house_creatives"), @@ -186,8 +186,8 @@ export default AdComponent.extend({ this.site, this.siteSettings, placement, - postNumber, - indexNumber + indexNumber, + postNumber ); }, diff --git a/assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.js b/assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.js index a7fdfaf..2a44981 100644 --- a/assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.js +++ b/assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.js @@ -3,12 +3,13 @@ import { slotContenders } from "discourse/plugins/discourse-adplugin/discourse/c export default { shouldRender(args, component) { return ( + args.index && slotContenders( component.site, component.siteSettings, "topic-list-between", args.index - ).length === 0 + ).length > 0 ); }, };