Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-03 22:47:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: messages list ArrowUp/ArrowDown broken

Browse source
This commit is contained in:
djmaze 2021-02-12 12:00:06 +01:00
parent c47ed18db9
commit a2727c65fe
4 changed files with 18 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

29
dev/Common/Selector.js
View file

@ -232,20 +232,6 @@ export class Selector {
}
}
/**
* @param {boolean} forceSelect
*/
goDown(forceSelect) {
this.newSelectPosition('ArrowDown', false, forceSelect);
}
/**
* @param {boolean} forceSelect
*/
goUp(forceSelect) {
this.newSelectPosition('ArrowUp', false, forceSelect);
}
unselect() {
this.selectedItem(null);
this.focusedItem(null);
@ -283,8 +269,7 @@ export class Selector {
return true;
});
shortcuts.add('arrowup', 'meta', keyScope, () => false);
shortcuts.add('arrowdown', 'meta', keyScope, () => false);
shortcuts.add('arrowup,arrowdown', 'meta', keyScope, () => false);
shortcuts.add('arrowup,arrowdown', 'shift', keyScope, event => {
this.newSelectPosition(event.key, true);
@ -329,7 +314,7 @@ export class Selector {
result = null;
const pageStep = 10,
list = this.list,
list = this.list(),
listLen = list.length,
focused = this.focusedItem();
@ -342,9 +327,7 @@ export class Selector {
} else if (++i < listLen) {
result = list[i];
}
if (!result && ' ' !== sEventKey) {
(this.oCallbacks.onUpUpOrDownDown || (()=>true))('ArrowUp' === sEventKey);
}
result || (this.oCallbacks.onUpUpOrDownDown || (()=>true))('ArrowUp' === sEventKey);
} else if ('Home' === sEventKey) {
result = list[0];
} else if ('End' === sEventKey) {
@ -361,13 +344,11 @@ export class Selector {
}
}
} else if (
'ArrowUp' == sEventKey ||
'Home' == sEventKey ||
'PageUp' == sEventKey
) {
result = list[0];
} else if (
'ArrowDown' === sEventKey ||
'End' === sEventKey ||
'PageDown' === sEventKey
) {
@ -392,9 +373,7 @@ export class Selector {
this.scrollToFocused();
} else if (focused) {
if (bShiftKey && isArrow) {
focused.checked(!focused.checked());
} else if (' ' === sEventKey) {
if ((bShiftKey && isArrow) || ' ' === sEventKey) {
focused.checked(!focused.checked());
}