github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-10 04:05:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix scrolling to reply via 'reply' as near parameter

Browse Source
This commit is contained in:
Alexander Skvortsov 2020-10-16 12:04:45 -04:00
parent 2df4a1a4a8
commit 086c06145c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/js/src/forum/resolvers/DiscussionPageResolver.ts
View File

@ -15,7 +15,7 @@ function getDiscussionIdFromSlug(slug: string | undefined) {
* in the same discussion. * in the same discussion.
*/ */
export default class DiscussionPageResolver extends DefaultResolver { export default class DiscussionPageResolver extends DefaultResolver {
static scrollToPostNumber: number | null = null; static scrollToPostNumber: string | number | null = null;
makeKey() { makeKey() {
const params = { ...m.route.param() }; const params = { ...m.route.param() };
@ -28,7 +28,7 @@ export default class DiscussionPageResolver extends DefaultResolver {
onmatch(args, requestedPath, route) { onmatch(args, requestedPath, route) {
if (route.includes('/d/:id') && getDiscussionIdFromSlug(args.id) === getDiscussionIdFromSlug(m.route.param('id'))) { if (route.includes('/d/:id') && getDiscussionIdFromSlug(args.id) === getDiscussionIdFromSlug(m.route.param('id'))) {
DiscussionPageResolver.scrollToPostNumber = parseInt(args.near); DiscussionPageResolver.scrollToPostNumber = args.near === 'reply' ? 'reply' : parseInt(args.near);
} }
return super.onmatch(args, requestedPath, route); return super.onmatch(args, requestedPath, route);