From 0330f831d42525630aa3d25e84565cfd09074313 Mon Sep 17 00:00:00 2001 From: Rizwan Mustafa Date: Sat, 25 Jun 2022 15:15:32 +0500 Subject: [PATCH] Fix circular dep between `leaderboard.ts` and `route-controller.ts` (#3226) * Fix circular dep * Make query more specific --- frontend/src/ts/controllers/route-controller.ts | 10 +++++++++- frontend/src/ts/elements/leaderboards.ts | 9 --------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/frontend/src/ts/controllers/route-controller.ts b/frontend/src/ts/controllers/route-controller.ts index 217b5d64d..f8c6be96e 100644 --- a/frontend/src/ts/controllers/route-controller.ts +++ b/frontend/src/ts/controllers/route-controller.ts @@ -137,6 +137,14 @@ document.addEventListener("DOMContentLoaded", () => { }); }); -$("#top .logo").click(() => { +$("#top .logo").on("click", () => { navigate("/"); }); + +$("#leaderboards .entryName").on("click", (e) => { + const uid = $(e.target).attr("uid"); + if (uid) { + navigate(`/profile/${uid}`); + Leaderboards.hide(); + } +}); diff --git a/frontend/src/ts/elements/leaderboards.ts b/frontend/src/ts/elements/leaderboards.ts index 3400fb224..07dd950f7 100644 --- a/frontend/src/ts/elements/leaderboards.ts +++ b/frontend/src/ts/elements/leaderboards.ts @@ -7,7 +7,6 @@ import format from "date-fns/format"; import { Auth } from "../firebase"; import differenceInSeconds from "date-fns/differenceInSeconds"; import { getHTMLById as getBadgeHTMLbyId } from "../controllers/badge-controller"; -import { navigate } from "../controllers/route-controller"; let currentTimeRange: "allTime" | "daily" = "allTime"; let currentLanguage = "english"; @@ -349,14 +348,6 @@ async function fillTable(lb: LbKey, prepend?: number): Promise { } else { $(`#leaderboardsWrapper table.${side} tbody`).prepend(html); } - - $(".entryName").on("click", (e) => { - const uid = $(e.target).attr("uid"); - if (uid) { - navigate(`/profile/${uid}`); - hide(); - } - }); } const showYesterdayButton = $("#leaderboardsWrapper .showYesterdayButton");