embarklabs
/
neo-blessed
mirror of https://github.com/embarklabs/neo-blessed.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

pass object in to attr functions.

This commit is contained in:
Christopher Jeffrey 2013-07-16 04:23:11 -05:00
parent 0aafeb2530
commit db365a2228
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/widget.js
View File

@ -2601,9 +2601,11 @@ List.prototype.add = function(item) {
// TODO: Move all specific options to their own object namespaces.
var sname = 'selected' + name[0].toUpperCase() + name.substring(1);
options[name] = function() {
return self.items[self.selected] === item
var attr = self.items[self.selected] === item
? self[sname]
: self[name];
if (typeof attr === 'function') attr = attr(item);
return attr;
};
});
@ -4233,14 +4235,14 @@ function sattr(obj, fg, bg) {
// This used to be a loop, but I decided
// to unroll it for performance's sake.
if (typeof bold === 'function') bold = bold();
if (typeof underline === 'function') underline = underline();
if (typeof blink === 'function') blink = blink();
if (typeof inverse === 'function') inverse = inverse();
if (typeof invisible === 'function') invisible = invisible();
if (typeof bold === 'function') bold = bold(obj);
if (typeof underline === 'function') underline = underline(obj);
if (typeof blink === 'function') blink = blink(obj);
if (typeof inverse === 'function') inverse = inverse(obj);
if (typeof invisible === 'function') invisible = invisible(obj);
if (typeof fg === 'function') fg = fg();
if (typeof bg === 'function') bg = bg();
if (typeof fg === 'function') fg = fg(obj);
if (typeof bg === 'function') bg = bg(obj);
return ((((invisible ? 16 : 0) << 18)
| ((inverse ? 8 : 0) << 18)