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

FIX: Correctly reset `controllerReady` prop (#18727)

This commit is contained in:
Jarek Radosz 2022-10-24 23:00:37 +02:00 committed by GitHub
parent ab330a98ad
commit 589a249a65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/app/controllers/topic.js
View File

@ -71,6 +71,7 @@ export default Controller.extend(bufferedProperty("model"), {
currentPostId: null, currentPostId: null,
userLastReadPostNumber: null, userLastReadPostNumber: null,
highestPostNumber: null, highestPostNumber: null,
controllerReady: false,
init() { init() {
this._super(...arguments); this._super(...arguments);

14
app/assets/javascripts/discourse/app/routes/topic.js
View File

@ -16,16 +16,9 @@ const SCROLL_DELAY = 500;
const TopicRoute = DiscourseRoute.extend({ const TopicRoute = DiscourseRoute.extend({
screenTrack: service(), screenTrack: service(),
init() { scheduledReplace: null,
this._super(...arguments); lastScrollPos: null,
isTransitioning: false,
this.setProperties({
isTransitioning: false,
scheduledReplace: null,
lastScrollPos: null,
controllerReady: true,
});
},
redirect() { redirect() {
return this.redirectIfLoginRequired(); return this.redirectIfLoginRequired();
@ -359,6 +352,7 @@ const TopicRoute = DiscourseRoute.extend({
model, model,
editingTopic: false, editingTopic: false,
firstPostExpanded: false, firstPostExpanded: false,
controllerReady: false,
}); });
this.searchService.set("searchContext", model.get("searchContext")); this.searchService.set("searchContext", model.get("searchContext"));