From 086c06145c3fed0af046f7e90a0d4ed7751a1e89 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Fri, 16 Oct 2020 12:04:45 -0400 Subject: [PATCH] Fix scrolling to reply via `'reply'` as `near` parameter --- .../core/js/src/forum/resolvers/DiscussionPageResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/core/js/src/forum/resolvers/DiscussionPageResolver.ts b/framework/core/js/src/forum/resolvers/DiscussionPageResolver.ts index fc7d1d1c5..56ce0f597 100644 --- a/framework/core/js/src/forum/resolvers/DiscussionPageResolver.ts +++ b/framework/core/js/src/forum/resolvers/DiscussionPageResolver.ts @@ -15,7 +15,7 @@ function getDiscussionIdFromSlug(slug: string | undefined) { * in the same discussion. */ export default class DiscussionPageResolver extends DefaultResolver { - static scrollToPostNumber: number | null = null; + static scrollToPostNumber: string | number | null = null; makeKey() { const params = { ...m.route.param() }; @@ -28,7 +28,7 @@ export default class DiscussionPageResolver extends DefaultResolver { onmatch(args, requestedPath, route) { 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);