Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Subfolder sites rewriting URLs to root domain on initial load #8932

Merged
merged 2 commits into from Feb 12, 2020
Merged

FIX: Subfolder sites rewriting URLs to root domain on initial load #8932

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b810a5f
FIX: Subfolder sites rewriting URLs to root domain on initial load
davidtaylorhq Feb 11, 2020
b11a694
Merge branch 'master' into subfolder-location
jjaffeux Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/assets/javascripts/discourse/lib/discourse-location.js.es6
View file
Open in desktop
Expand Up @@ -17,17 +17,16 @@ const DiscourseLocation = EmberObject.extend({
this._super(...arguments);

this.set("location", this.location || window.location);
this.initOptions();
},

/**
@private

Used to set state on first call to setURL

@method initOptions
@method initState
*/
initOptions() {
initState() {
const history = this.history || window.history;
if (history && history.scrollRestoration) {
history.scrollRestoration = "manual";
Expand Down