Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: shift+j and shift+k will scroll entire posts (#25684) 

* FEATURE: shift+j and shift+k will scroll entire posts

When scrolling through topics with very long posts we would like to use
`shift+j` and `shift+k` to quickly move between posts.

This allows users to bypass the scroll within post behavior when zooming
through topics with keyboard shortcuts

This overloads the behavior of shift+k and j which can be used to scroll
through sections (new/latest/etc...)

* remove useless tests

These tests are testing nothing, no point carrying them around
This commit is contained in:
Sam 2024-02-16 08:50:29 +11:00 committed by GitHub
parent ef59fcea68
commit 9e5e5d4078
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
View File

@ -403,11 +403,11 @@ export default {
},
selectDown() {
this._moveSelection(1);
this._moveSelection({ direction: 1, scrollWithinPosts: true });
},
selectUp() {
this._moveSelection(-1);
this._moveSelection({ direction: -1, scrollWithinPosts: true });
},
goBack() {
@ -640,7 +640,7 @@ export default {
}
},
_moveSelection(direction) {
_moveSelection({ direction, scrollWithinPosts }) {
// Pressing a move key (J/K) very quick (i.e. keeping J or K pressed) will
// move fast by disabling smooth page scrolling.
const now = +new Date();
@ -691,7 +691,7 @@ export default {
let article = selected;
// Try doing a page scroll in the context of current post.
if (!fast && direction !== 0 && article) {
if (!fast && direction !== 0 && article && scrollWithinPosts) {
// The beginning of first article is the beginning of the page.
const beginArticle =
article.classList.contains("topic-post") &&
@ -761,7 +761,12 @@ export default {
const articleTop = domUtils.offset(article).top,
articleTopPosition = articleTop - headerOffset();
if (!fast && direction < 0 && article.offsetHeight > window.innerHeight) {
if (
scrollWithinPosts &&
!fast &&
direction < 0 &&
article.offsetHeight > window.innerHeight
) {
// Scrolling to the last "page" of the previous post if post has multiple
// "pages" (if its height does not fit in the screen).
return this._scrollTo(
@ -834,6 +839,11 @@ export default {
if (index >= 0 && index < sections.length) {
sections[index].querySelector("a")?.click();
}
if (sections.length === 0) {
// use for in post navigation
this._moveSelection({ direction, scrollWithinPosts: false });
}
},
_stopCallback() {

14
app/assets/javascripts/discourse/tests/unit/lib/keyboard-shortcuts-test.js
View File

@ -11,20 +11,6 @@ module("Unit | Utility | keyboard-shortcuts", function (hooks) {
sinon.stub(DiscourseURL, "routeTo");
});
test("selectDown calls _moveSelection with 1", function (assert) {
let stub = sinon.stub(KeyboardShortcuts, "_moveSelection");
KeyboardShortcuts.selectDown();
assert.ok(stub.calledWith(1), "_moveSelection is called with 1");
});
test("selectUp calls _moveSelection with -1", function (assert) {
let stub = sinon.stub(KeyboardShortcuts, "_moveSelection");
KeyboardShortcuts.selectUp();
assert.ok(stub.calledWith(-1), "_moveSelection is called with -1");
});
test("goBack calls history.back", function (assert) {
let called = false;
sinon.stub(history, "back").callsFake(function () {