Commit 8ab93e2

author

James Halliday

committed

comparison test now passes

1 parent 3af627d commit 8ab93e2Copy full SHA for 8ab93e2

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,15 @@ var json = typeof JSON !== 'undefined' ? JSON : require('jsonify');`
`3`	`3`	`module.exports = function (obj, opts) {`
`4`	`4`	`if (!opts) opts = {};`
`5`	`5`	`if (typeof opts === 'function') opts = { cmp: opts };`
`6`		`- var cmp = opts.cmp;`
	`6`	`+ var cmp = opts.cmp && (function (f) {`
	`7`	`+ return function (node) {`
	`8`	`+ return function (a, b) {`
	`9`	`+ var aobj = { key: a, value: node[a] };`
	`10`	`+ var bobj = { key: b, value: node[b] };`
	`11`	`+ return f(aobj, bobj);`
	`12`	`+ };`
	`13`	`+ };`
	`14`	`+ })(opts.cmp);`
`7`	`15`
`8`	`16`	`return (function stringify (node) {`
`9`	`17`	`if (typeof node !== 'object') {`
`@@ -17,7 +25,7 @@ module.exports = function (obj, opts) {`
`17`	`25`	`return '[' + out.join(',') + ']';`
`18`	`26`	`}`
`19`	`27`	`else {`
`20`		`- var keys = objectKeys(node).sort(cmp);`
	`28`	`+ var keys = objectKeys(node).sort(cmp(node));`
`21`	`29`	`var out = [];`
`22`	`30`	`for (var i = 0; i < keys.length; i++) {`
`23`	`31`	`var key = keys[i];`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ test('custom comparison function', function (t) {`
`5`	`5`	`t.plan(1);`
`6`	`6`	`var obj = { c: 8, b: [{z:6,y:5,x:4},7], a: 3 };`
`7`	`7`	`var s = stringify(obj, function (a, b) {`
`8`		`- return a.key < b.key ? -1 : 1;`
	`8`	`+ return a.key < b.key ? 1 : -1;`
`9`	`9`	`});`
`10`	`10`	`t.equal(s, '{"c":8,"b":[{"z":6,"y":5,"x":4},7],"a":3}');`
`11`	`11`	`});`

Comments

(0)