Merge develop

This commit is contained in:
DABH 2018-05-04 17:55:31 -07:00
commit 32906a23ad
3 changed files with 4 additions and 3 deletions

View File

@ -13,5 +13,6 @@ node_js:
- "0.8" - "0.8"
script: script:
- npm install - npm install
- "./node_modules/.bin/eslint . " - npm install if-node-version
- if-node-version ">=4" "./node_modules/.bin/eslint . "
- npm test - npm test

View File

@ -105,7 +105,7 @@ function applyStyle() {
var args = Array.prototype.slice.call(arguments); var args = Array.prototype.slice.call(arguments);
var str = args.map(function(arg) { var str = args.map(function(arg) {
return typeof arg === 'object' ? util.inspect(arg) : arg; return arg.constructor === String ? arg : util.inspect(arg);
}).join(' '); }).join(' ');
if (!colors.enabled || !str) { if (!colors.enabled || !str) {

View File

@ -1,7 +1,7 @@
{ {
"name": "colors", "name": "colors",
"description": "get colors in your node.js console", "description": "get colors in your node.js console",
"version": "1.2.3", "version": "1.2.4",
"author": "Marak Squires", "author": "Marak Squires",
"homepage": "https://github.com/Marak/colors.js", "homepage": "https://github.com/Marak/colors.js",
"bugs": "https://github.com/Marak/colors.js/issues", "bugs": "https://github.com/Marak/colors.js/issues",