embarklabs/neo-blessed
2
0
Fork 0
mirror of https://github.com/embarklabs/neo-blessed.git synced 2025-02-27 10:00:46 +00:00
Code Issues Projects Releases Wiki Activity

form: do not focus invisible elements.

Browse Source
This commit is contained in:
Christopher Jeffrey 2014-01-16 18:08:59 -06:00
parent f2ec07fd1c
commit 9673eaf517
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/widget.js
View File

@ -4397,16 +4397,21 @@ Form.prototype.next = function() {
if (!this._selected) { if (!this._selected) {
this._selected = this._children[0]; this._selected = this._children[0];
if (!this._selected.visible) return this.next();
// return this._selected; // return this._selected;
if (this.screen.focused !== this._selected) return this._selected; if (this.screen.focused !== this._selected) return this._selected;
} }
var i = this._children.indexOf(this._selected); var i = this._children.indexOf(this._selected);
if (!~i || !this._children[i + 1]) { if (!~i || !this._children[i + 1]) {
return this._selected = this._children[0]; this._selected = this._children[0];
if (!this._selected.visible) return this.next();
return this._selected;
} }
return this._selected = this._children[i + 1]; this._selected = this._children[i + 1];
if (!this._selected.visible) return this.next();
return this._selected;
}; };
Form.prototype.previous = function() { Form.prototype.previous = function() {
@ -4414,16 +4419,21 @@ Form.prototype.previous = function() {
if (!this._selected) { if (!this._selected) {
this._selected = this._children[this._children.length - 1]; this._selected = this._children[this._children.length - 1];
if (!this._selected.visible) return this.previous();
// return this._selected; // return this._selected;
if (this.screen.focused !== this._selected) return this._selected; if (this.screen.focused !== this._selected) return this._selected;
} }
var i = this._children.indexOf(this._selected); var i = this._children.indexOf(this._selected);
if (!~i || !this._children[i - 1]) { if (!~i || !this._children[i - 1]) {
return this._selected = this._children[this._children.length - 1]; this._selected = this._children[this._children.length - 1];
if (!this._selected.visible) return this.previous();
return this._selected;
} }
return this._selected = this._children[i - 1]; this._selected = this._children[i - 1];
if (!this._selected.visible) return this.previous();
return this._selected;
}; };
Form.prototype.focusNext = function() { Form.prototype.focusNext = function() {