github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 10:05:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Make navigateToTopic more robust for themes/plugins (#22992)

Browse Source 
This function was previously expecting multiple services to be injected on any class that uses it. This kind of hidden requirement leads to some very difficult-to-debug situations, so this commit updates the function to lookup all its required services inline.
This commit is contained in:
David Taylor 2023-08-07 15:28:17 +01:00 committed by Jeff Wong
parent 28b632aceb
commit 457b10e68a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/discourse/app/components/topic-list-item.js
View File

@ -14,6 +14,7 @@ import { topicTitleDecorators } from "discourse/components/topic-title";
import { wantsNewWindow } from "discourse/lib/intercept-click"; import { wantsNewWindow } from "discourse/lib/intercept-click";
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";
import { getOwner } from "@ember/application";
export function showEntrance(e) { export function showEntrance(e) {
let target = $(e.target); let target = $(e.target);
@ -35,15 +36,21 @@ export function showEntrance(e) {
} }
export function navigateToTopic(topic, href) { export function navigateToTopic(topic, href) {
if (this.siteSettings.page_loading_indicator !== "slider") { const owner = getOwner(this);
const siteSettings = owner.lookup("service:site-settings");
const router = owner.lookup("service:router");
const session = owner.lookup("service:session");
const appEvents = owner.lookup("service:appEvents");
if (siteSettings.page_loading_indicator !== "slider") {
// With the slider, it feels nicer for the header to update once the rest of the topic content loads, // With the slider, it feels nicer for the header to update once the rest of the topic content loads,
// so skip setting it early. // so skip setting it early.
this.appEvents.trigger("header:update-topic", topic); appEvents.trigger("header:update-topic", topic);
} }
this.session.set("lastTopicIdViewed", { session.set("lastTopicIdViewed", {
topicId: topic.id, topicId: topic.id,
historyUuid: this.router.location.getState?.().uuid, historyUuid: router.location.getState?.().uuid,
}); });
DiscourseURL.routeTo(href || topic.get("url")); DiscourseURL.routeTo(href || topic.get("url"));