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

FIX: Preserve anchors in permalink transitions (#10421)

Browse Source 
When visiting a permalink with an anchor (e.g. /important-link#notes) the anchor part was being dropped during redirection.

The change doesn't have a test. Functions like scrollToPost or scrollToElement don't have any effect in the test environment.
This commit is contained in:
Jarek Radosz
2020-08-13 16:44:34 +02:00
committed by GitHub
parent 7a8442435c
commit ab5df7b2bd
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -480,6 +480,8 @@ const DiscourseURL = EmberObject.extend({
} }
transition._discourse_intercepted = true; transition._discourse_intercepted = true;
transition._discourse_anchor = elementId;
const promise = transition.promise || transition; const promise = transition.promise || transition;
promise.then(() => jumpToElement(elementId)); promise.then(() => jumpToElement(elementId));
} }

13
app/assets/javascripts/discourse/app/routes/unknown.js
View File

@@ -11,7 +11,18 @@ export default DiscourseRoute.extend({
if (results.found) { if (results.found) {
// Avoid polluting the history stack for external links // Avoid polluting the history stack for external links
transition.abort(); transition.abort();
DiscourseURL.routeTo(results.target_url);
let url = results.target_url;
if (transition._discourse_anchor) {
// Remove the anchor from the permalink if present
url = url.split("#")[0];
// Add the anchor from the transition
url += `#${transition._discourse_anchor}`;
}
DiscourseURL.routeTo(url);
return ""; return "";
} else { } else {
// 404 body HTML // 404 body HTML