From aaa8a379b9aa4fccd7f2d4cf32524ad7aa1eb578 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Tue, 7 Sep 2021 13:44:49 +0800 Subject: [PATCH] DEV: Don't transition miniprofiler on first page load. (#14265) See https://meta.discourse.org/t/-/202482/5 --- .../discourse/app/initializers/page-tracking.js | 4 ++-- app/assets/javascripts/discourse/app/lib/clean-dom.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/app/initializers/page-tracking.js b/app/assets/javascripts/discourse/app/initializers/page-tracking.js index 13858cbc242..df11851a6ef 100644 --- a/app/assets/javascripts/discourse/app/initializers/page-tracking.js +++ b/app/assets/javascripts/discourse/app/initializers/page-tracking.js @@ -15,8 +15,8 @@ export default { const router = container.lookup("router:main"); router.on("routeWillChange", viewTrackingRequired); - router.on("routeDidChange", () => { - cleanDOM(container); + router.on("routeDidChange", (transition) => { + cleanDOM(container, { skipMiniProfilerPageTransition: !transition.from }); }); let appEvents = container.lookup("service:app-events"); diff --git a/app/assets/javascripts/discourse/app/lib/clean-dom.js b/app/assets/javascripts/discourse/app/lib/clean-dom.js index 04156ec871e..00403b30f47 100644 --- a/app/assets/javascripts/discourse/app/lib/clean-dom.js +++ b/app/assets/javascripts/discourse/app/lib/clean-dom.js @@ -1,7 +1,7 @@ import { scheduleOnce } from "@ember/runloop"; -function _clean() { - if (window.MiniProfiler) { +function _clean(opts = {}) { + if (window.MiniProfiler && !opts.skipMiniProfilerPageTransition) { window.MiniProfiler.pageTransition(); } @@ -29,6 +29,6 @@ function _clean() { this.lookup("service:document-title").updateContextCount(0); } -export function cleanDOM(container) { - scheduleOnce("afterRender", container, _clean); +export function cleanDOM(container, opts) { + scheduleOnce("afterRender", container, _clean, opts); }