From ff151cb5800d4f51299cc229e72d11d14ec5e44d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 6 Jan 2020 15:43:36 +0100
Subject: [PATCH] FIX: allows scroll on load for discovery topic list (#8661)

---
 .../discourse/templates/discovery/topics.hbs  |  1 +
 .../templates/mobile/discovery/topics.hbs     | 20 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 7cf20a817c..e7b2d385ad 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -72,6 +72,7 @@
       category=category
       topics=model.topics
       discoveryList=true
+      scrollOnLoad=true
       onScroll=discoveryTopicList.saveScrollPosition}}
   {{/if}}
 {{/discovery-topics-list}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index 6c62f879de..735b07b11c 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -13,16 +13,16 @@
 
   {{#if hasTopics}}
     {{topic-list
-        highlightLastVisited=true
-        showPosters=true
-        hideCategory=model.hideCategory
-        order=order
-        ascending=ascending
-        topics=model.topics
-        expandGloballyPinned=expandGloballyPinned
-        expandAllPinned=expandAllPinned
-        category=category
-        }}
+      highlightLastVisited=true
+      showPosters=true
+      hideCategory=model.hideCategory
+      order=order
+      ascending=ascending
+      topics=model.topics
+      expandGloballyPinned=expandGloballyPinned
+      expandAllPinned=expandAllPinned
+      scrollOnLoad=true
+      category=category}}
   {{/if}}
 {{/discovery-topics-list}}