diff options
| author | Forrest L Norvell <forrest@npmjs.com> | 2015-02-20 09:03:34 -0800 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-02-22 07:42:24 +0100 |
| commit | 1e2fa1537f9978acbd27db6ee151885ab02346c1 (patch) | |
| tree | aa886046ac044759ab2c4650d4b45d2b736dbcde /deps/npm/node_modules/columnify | |
| parent | 3ab9b92e90e4bb3ed68457fcb95bc32f17586f3a (diff) | |
| download | android-node-v8-1e2fa1537f9978acbd27db6ee151885ab02346c1.tar.gz android-node-v8-1e2fa1537f9978acbd27db6ee151885ab02346c1.tar.bz2 android-node-v8-1e2fa1537f9978acbd27db6ee151885ab02346c1.zip | |
deps: upgrade npm to 2.6.0
PR-URL: https://github.com/iojs/io.js/pull/904
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/npm/node_modules/columnify')
3 files changed, 9 insertions, 8 deletions
diff --git a/deps/npm/node_modules/columnify/Readme.md b/deps/npm/node_modules/columnify/Readme.md index d0deee1bb6..b2b846f366 100644 --- a/deps/npm/node_modules/columnify/Readme.md +++ b/deps/npm/node_modules/columnify/Readme.md @@ -175,11 +175,11 @@ console.log(columns) #### Output: ``` -NAME DESCRIPTION VERSION -mod1 some description which happens 0.0.1 - to be far larger than the max -module-two another description larger 0.2.0 - than the max +NAME DESCRIPTION VERSION +mod1 some description which happens 0.0.1 + to be far larger than the max +module-two another description larger 0.2.0 + than the max ``` #### Maximum Line Width @@ -392,8 +392,8 @@ var columns = columnify([{ ``` #### Output: ``` -*MODULE NAME* DESCRIPTION -mod1 some description text. +*MODULE NAME* DESCRIPTION +mod1 some description text. module-two some slightly longer description text. ``` diff --git a/deps/npm/node_modules/columnify/columnify.js b/deps/npm/node_modules/columnify/columnify.js index 912ab84585..548efc679d 100644 --- a/deps/npm/node_modules/columnify/columnify.js +++ b/deps/npm/node_modules/columnify/columnify.js @@ -298,3 +298,4 @@ function toArray(items, columnNames) { } return rows; } + diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js index 321ffa30f5..f8fa3159a7 100644 --- a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js +++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js @@ -114,7 +114,7 @@ function clone(parent, circular, depth, prototype) { if (proto) { attrs = Object.getOwnPropertyDescriptor(proto, i); } - + if (attrs && attrs.set == null) { continue; } |