PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-06-16 18:16:59 +00:00
commit 224d55fbd9
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/components/structures/LeftPanel.js
View file

@ -93,6 +93,13 @@ var LeftPanel = React.createClass({
this._onMoveFocus(false); this._onMoveFocus(false);
handled = true; handled = true;
break; break;
case KeyCode.ENTER:
this._onMoveFocus(false);
if (this.focusedElement) {
this.focusedElement.click();
}
handled = true;
break;
} }
if (handled) { if (handled) {
@ -102,37 +109,33 @@ var LeftPanel = React.createClass({
}, },
_onMoveFocus: function(up) { _onMoveFocus: function(up) {
var element = this.focusedElement; let element = this.focusedElement;
// unclear why this isn't needed // unclear why this isn't needed
// var descending = (up == this.focusDirection) ? this.focusDescending : !this.focusDescending; // var descending = (up == this.focusDirection) ? this.focusDescending : !this.focusDescending;
// this.focusDirection = up; // this.focusDirection = up;
var descending = false; // are we currently descending or ascending through the DOM tree? let descending = false; // are we currently descending or ascending through the DOM tree?
var classes; let classes;
do { do {
var child = up ? element.lastElementChild : element.firstElementChild; const child = up ? element.lastElementChild : element.firstElementChild;
var sibling = up ? element.previousElementSibling : element.nextElementSibling; const sibling = up ? element.previousElementSibling : element.nextElementSibling;
if (descending) { if (descending) {
if (child) { if (child) {
element = child; element = child;
} } else if (sibling) {
else if (sibling) {
element = sibling; element = sibling;
} } else {
else {
descending = false; descending = false;
element = element.parentElement; element = element.parentElement;
} }
} } else {
else {
if (sibling) { if (sibling) {
element = sibling; element = sibling;
descending = true; descending = true;
} } else {
else {
element = element.parentElement; element = element.parentElement;
} }
} }
@ -144,8 +147,7 @@ var LeftPanel = React.createClass({
descending = true; descending = true;
} }
} }
} while (element && !(
} while(element && !(
classes.contains("mx_RoomTile") || classes.contains("mx_RoomTile") ||
classes.contains("mx_SearchBox_search") || classes.contains("mx_SearchBox_search") ||
classes.contains("mx_RoomSubList_ellipsis"))); classes.contains("mx_RoomSubList_ellipsis")));