Merge develop

DABH · DABH · commit 32906a23ad0d · 2018-05-04T17:55:31.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -13,5 +13,6 @@ node_js:
   - "0.8"
 script:
   - npm install
-  - "./node_modules/.bin/eslint . "
+  - npm install if-node-version
+  - if-node-version ">=4" "./node_modules/.bin/eslint . "
   - npm test
diff --git a/lib/colors.js b/lib/colors.js
@@ -105,7 +105,7 @@ function applyStyle() {
   var args = Array.prototype.slice.call(arguments);
 
   var str = args.map(function(arg) {
-    return typeof arg === 'object' ? util.inspect(arg) : arg;
+    return arg.constructor === String ? arg : util.inspect(arg);
   }).join(' ');
 
   if (!colors.enabled || !str) {
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "colors",
     "description": "get colors in your node.js console",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "author": "Marak Squires",
     "homepage": "https://github.com/Marak/colors.js",
     "bugs": "https://github.com/Marak/colors.js/issues",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "colors",`
`3`	`3`	`"description": "get colors in your node.js console",`
`4`		`- "version": "1.2.3",`
	`4`	`+ "version": "1.2.4",`
`5`	`5`	`"author": "Marak Squires",`
`6`	`6`	`"homepage": "https://github.com/Marak/colors.js",`
`7`	`7`	`"bugs": "https://github.com/Marak/colors.js/issues",`