IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Use service: lookups instead of :main (#25402)

Browse Source 
where applicable
This commit is contained in:
Jarek Radosz
2024-01-24 15:59:44 +01:00
committed by GitHub
parent 57c4b6bd50
commit fd3c3fa565
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/app/lib/url.js
View File

@@ -160,12 +160,12 @@ const DiscourseURL = EmberObject.extend({
replaceState(path) {
if (path.startsWith("#")) {
path = this.router.currentURL.replace(/#.*$/, "") + path;
path = this.routerService.currentURL.replace(/#.*$/, "") + path;
}
path = withoutPrefix(path);
if (this.router.currentURL !== path) {
if (this.routerService.currentURL !== path) {
// Always use replaceState in the next runloop to prevent weird routes changing
// while URLs are loading. For example, while a topic loads it sets `currentPost`
// which triggers a replaceState even though the topic hasn't fully loaded yet!
@@ -228,7 +228,7 @@ const DiscourseURL = EmberObject.extend({
return this.replaceState(path);
}
const oldPath = this.router.currentURL;
const oldPath = this.routerService.currentURL;
path = path.replace(/(https?\:)?\/\/[^\/]+/, "");
@@ -415,8 +415,6 @@ const DiscourseURL = EmberObject.extend({
handleURL(path, opts) {
opts = opts || {};
const router = this.router;
if (opts.replaceURL) {
this.replaceState(path);
}
@@ -429,7 +427,7 @@ const DiscourseURL = EmberObject.extend({
elementId = split[1];
}
const transition = router.transitionTo(path);
const transition = this.routerService.transitionTo(path);
transition._discourse_intercepted = true;
transition._discourse_anchor = elementId;