flynx/colors.js
1
0
Fork 0
mirror of https://github.com/flynx/colors.js.git synced 2025-10-29 19:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #232 from ALE-Rainbow/master

Browse Source 
Fix #180 - Custom with multi attr failure
This commit is contained in:
DABH 2018-07-22 14:29:06 -07:00 committed by GitHub
commit ba56f52c62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/extendStringPrototype.js
View File

@ -73,19 +73,17 @@ module['exports'] = function() {
} else { } else {
if (typeof(theme[prop]) === 'string') { if (typeof(theme[prop]) === 'string') {
colors[prop] = colors[theme[prop]]; colors[prop] = colors[theme[prop]];
addProperty(prop, function() {
return colors[theme[prop]](this);
});
} else { } else {
var tmp = colors[theme[prop][0]];
for (var t = 1; t < theme[prop].length; t++) {
tmp = tmp[theme[prop][t]];
}
colors[prop] = tmp;
}
addProperty(prop, function() { addProperty(prop, function() {
var ret = this; return colors[prop](this);
for (var t = 0; t < theme[prop].length; t++) {
ret = colors[theme[prop][t]](ret);
}
return ret;
}); });
} }
}
}); });
} }

10
tests/basic-test.js
View File

@ -61,3 +61,13 @@ assert.equal(typeof ('astring'.red), 'string');
assert.equal(typeof ('astring'.error), 'string'); assert.equal(typeof ('astring'.error), 'string');
assert.equal(s, 'string'); assert.equal(s, 'string');
colors.setTheme({custom: ['blue', 'bold', 'underline']});
assert.equal(colors.custom(s),
'\x1b[34m' + '\x1b[1m' + '\x1b[4m' + s +
'\x1b[24m' + '\x1b[22m' + '\x1b[39m' );
colors.setTheme({custom: ['red', 'italic', 'inverse']});
assert.equal(colors.custom(s),
'\x1b[31m' + '\x1b[3m' + '\x1b[7m' + s +
'\x1b[27m' + '\x1b[23m' + '\x1b[39m' );

9
tests/safe-test.js
View File

@ -57,3 +57,12 @@ colors.setTheme({error: 'red'});
assert.equal(typeof (colors.red('astring')), 'string'); assert.equal(typeof (colors.red('astring')), 'string');
assert.equal(typeof (colors.error('astring')), 'string'); assert.equal(typeof (colors.error('astring')), 'string');
colors.setTheme({custom: ['blue', 'bold', 'underline']});
assert.equal(colors.custom(s),
'\x1b[4m' + '\x1b[1m' + '\x1b[34m' + s +
'\x1b[39m' + '\x1b[22m' + '\x1b[24m' );
colors.setTheme({custom: ['red', 'italic', 'inverse']});
assert.equal(colors.custom(s),
'\x1b[7m' + '\x1b[3m' + '\x1b[31m' + s +
'\x1b[39m' + '\x1b[23m' + '\x1b[27m' );