diff --git a/js/forum/src/components/DiscussionPage.js b/js/forum/src/components/DiscussionPage.js index bcfb15c47..ca9033f18 100644 --- a/js/forum/src/components/DiscussionPage.js +++ b/js/forum/src/components/DiscussionPage.js @@ -65,8 +65,10 @@ export default class DiscussionPage extends mixin(Component, evented) { if (m.route.param('id') === this.discussion.id()) { e.preventDefault(); - if (Number(m.route.param('near')) !== Number(this.near)) { - this.stream.goToNumber(m.route.param('near') || 1); + const near = Number(m.route.param('near')) || 1; + + if (near !== Number(this.near)) { + this.stream.goToNumber(near); } this.near = null; diff --git a/js/forum/src/initializers/routes.js b/js/forum/src/initializers/routes.js index bd9cf23e0..abd2c7ff1 100644 --- a/js/forum/src/initializers/routes.js +++ b/js/forum/src/initializers/routes.js @@ -35,10 +35,10 @@ export default function(app) { * @return {String} */ app.route.discussion = (discussion, near) => { - return app.route(near ? 'discussion.near' : 'discussion', { + return app.route(near > 1 ? 'discussion.near' : 'discussion', { id: discussion.id(), slug: discussion.slug(), - near: near + near: near > 1 ? near : undefined }); };