From 188092ee9bd4c908d0a8244c819b68295d0da385 Mon Sep 17 00:00:00 2001 From: jwildfire Date: Wed, 19 Feb 2020 11:45:36 -0500 Subject: [PATCH 1/2] update version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 014cc76..c9e4fee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nested-data-explorer", - "description": "Makes tables for nested tables", - "version": "0.4.0", + "description": "Makes tables for nested data", + "version": "0.5.0", "author": "Rho, Inc.", "license": "MIT", "homepage": "", From c969b0337404fd90e67dbe7bd266b5d53813f912 Mon Sep 17 00:00:00 2001 From: jwildfire Date: Wed, 19 Feb 2020 11:52:32 -0500 Subject: [PATCH 2/2] fix sort bug. fix #6 --- nestedDataExplorer.js | 4 +++- package-lock.json | 2 +- package.json | 2 +- src/callbacks/onDraw/makeNestLevel.js | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nestedDataExplorer.js b/nestedDataExplorer.js index d85b617..fba059e 100644 --- a/nestedDataExplorer.js +++ b/nestedDataExplorer.js @@ -534,7 +534,9 @@ }) .entries(data) .sort(function(a, b) { - return config.sort_alpha ? b.key - a.key : b.values.n - a.values.n; + var alpha = a.key < b.key ? -1 : a.key > b.key ? 1 : 0; + var numeric = b.values.n - a.values.n; + return config.sort_alpha ? alpha : numeric; }); return myNest; diff --git a/package-lock.json b/package-lock.json index c6c63b6..1eee6c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nested-data-explorer", - "version": "0.4.0", + "version": "0.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c9e4fee..b8c8f51 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nested-data-explorer", "description": "Makes tables for nested data", - "version": "0.5.0", + "version": "0.4.1", "author": "Rho, Inc.", "license": "MIT", "homepage": "", diff --git a/src/callbacks/onDraw/makeNestLevel.js b/src/callbacks/onDraw/makeNestLevel.js index 6be64a8..fe38c15 100644 --- a/src/callbacks/onDraw/makeNestLevel.js +++ b/src/callbacks/onDraw/makeNestLevel.js @@ -59,7 +59,9 @@ export default function makeNestLevel(key, data, iterate) { }) .entries(data) .sort(function(a, b) { - return config.sort_alpha ? b.key - a.key : b.values.n - a.values.n; + let alpha = a.key < b.key ? -1 : a.key > b.key ? 1 : 0; + let numeric = b.values.n - a.values.n; + return config.sort_alpha ? alpha : numeric; }); return myNest;