Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: ensures spinner is showing on tags/show when loading more (#7876) 

Context: https://meta.discourse.org/t/issue-while-scrolling-down-after-selecting-a-tag-on-the-home-page/122542
This commit is contained in:
Joffrey JAFFEUX 2019-07-10 21:37:31 +02:00 committed by GitHub
parent 142344e45d
commit bd35a8f334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/assets/javascripts/discourse/templates/tags/show.hbs
View File

@ -52,32 +52,32 @@
<div class="row"> <div class="row">
<div class="full-width"> <div class="full-width">
<div id='list-area'> <div id='list-area'>
{{conditional-loading-spinner condition=loading}} {{#unless loading}}
{{#if list.topics}}
{{#discovery-topics-list model=list refresh=(action "refresh")}}
{{bulk-select-button selected=selected action=(action "refresh")}}
{{#unless loading}} {{topic-list topics=list.topics
{{#if list.topics}} canBulkSelect=canBulkSelect
{{#discovery-topics-list model=list refresh=(action "refresh")}} toggleBulkSelect=(action "toggleBulkSelect")
{{bulk-select-button selected=selected action=(action "refresh")}} bulkSelectEnabled=bulkSelectEnabled
selected=selected
showPosters=true
order=order
ascending=ascending
changeSort=(action "changeSort")}}
{{topic-list topics=list.topics {{/discovery-topics-list}}
canBulkSelect=canBulkSelect {{else}}
toggleBulkSelect=(action "toggleBulkSelect") <footer class='topic-list-bottom'>
bulkSelectEnabled=bulkSelectEnabled <h3>
selected=selected {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
showPosters=true </h3>
order=order </footer>
ascending=ascending {{/if}}
changeSort=(action "changeSort")}} {{/unless}}
{{/discovery-topics-list}} {{conditional-loading-spinner condition=list.loadingMore}}
{{else}}
<footer class='topic-list-bottom'>
<h3>
{{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
</h3>
</footer>
{{/if}}
{{/unless}}
</div> </div>
</div> </div>
</div> </div>