github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-13 13:18:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: When loading more topics, showFooter was not updated properly

Browse Source
This commit is contained in:
Robin Ward 2022-01-05 14:52:30 -05:00
parent e04069cf0d
commit 6e0e6014d1
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/app/components/discovery-topics-list.js
View File

@ -5,7 +5,7 @@ import LoadMore from "discourse/mixins/load-more";
import UrlRefresh from "discourse/mixins/url-refresh"; import UrlRefresh from "discourse/mixins/url-refresh";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";
const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, { export default Component.extend(UrlRefresh, LoadMore, {
classNames: ["contents"], classNames: ["contents"],
eyelineSelector: ".topic-list-item", eyelineSelector: ".topic-list-item",
documentTitle: service(), documentTitle: service(),
@ -60,9 +60,10 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
if (moreTopicsUrl && $(window).height() >= $(document).height()) { if (moreTopicsUrl && $(window).height() >= $(document).height()) {
this.send("loadMore"); this.send("loadMore");
} }
if (this.loadingComplete) {
this.loadingComplete();
}
}); });
}, },
}, },
}); });
export default DiscoveryTopicsListComponent;

3
app/assets/javascripts/discourse/app/controllers/discovery.js
View File

@ -1,5 +1,6 @@
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import { alias, equal, not } from "@ember/object/computed"; import { alias, equal, not } from "@ember/object/computed";
import { action } from "@ember/object";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import DiscourseURL from "discourse/lib/url"; import DiscourseURL from "discourse/lib/url";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";
@ -20,11 +21,13 @@ export default Controller.extend({
loadedAllItems: not("discoveryTopics.model.canLoadMore"), loadedAllItems: not("discoveryTopics.model.canLoadMore"),
@action
loadingBegan() { loadingBegan() {
this.set("loading", true); this.set("loading", true);
this.set("application.showFooter", false); this.set("application.showFooter", false);
}, },
@action
loadingComplete() { loadingComplete() {
this.set("loading", false); this.set("loading", false);
this.set("application.showFooter", this.loadedAllItems); this.set("application.showFooter", this.loadedAllItems);

1
app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
View File

@ -19,6 +19,7 @@ model=model showResetNew=showResetNew showDismissRead=showDismissRead resetNew=(
{{#discovery-topics-list {{#discovery-topics-list
model=model model=model
refresh=(action "refresh") refresh=(action "refresh")
loadingComplete=(action "loadingComplete")
incomingCount=topicTrackingState.incomingCount incomingCount=topicTrackingState.incomingCount
autoAddTopicsToBulkSelect=autoAddTopicsToBulkSelect autoAddTopicsToBulkSelect=autoAddTopicsToBulkSelect
bulkSelectEnabled=bulkSelectEnabled bulkSelectEnabled=bulkSelectEnabled