JavaScriptCollection
diff --git a/‎src/selection/sort.js‎
Lines changed: 1 addition & 1 deletion b/‎src/selection/sort.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/selection/sort-test.js‎
Lines changed: 6 additions & 6 deletions b/‎test/selection/sort-test.js‎
Lines changed: 6 additions & 6 deletions
@@ -10,6 +10,6 @@ d3_selectionPrototype.sort = function(comparator) {
 function d3_selection_sortComparator(comparator) {
   if (!arguments.length) comparator = d3.ascending;
   return function(a, b) {
-    return (!a - !b) || comparator(a.__data__, b.__data__);
+    return a && b ? comparator(a.__data__, b.__data__) : !a - !b;
   };
 }
@@ -44,18 +44,18 @@ suite.addBatch({
       "sorts null nodes at the end of the selection": function(span) {
         var nulls = 0;
         span[0][0].parentNode.removeChild(span[0][0]);
-        span[0][0] = null;
+        span[0][2].parentNode.removeChild(span[0][2]);
+        span[0][0] = span[0][2] = null;
         span.sort(function(a, b) { if ((a === null) || (b === null)) ++nulls; return a - b; });
         assert.equal(nulls, 0);
 
-        assert.isNull(span[0][3]);
+        assert.domNull(span[0][2]);
+        assert.domNull(span[0][3]);
         assert.domNull(span[0][0].previousSibling);
         assert.domEqual(span[0][1], span[0][0].nextSibling);
         assert.domEqual(span[0][0], span[0][1].previousSibling);
-        assert.domEqual(span[0][2], span[0][1].nextSibling);
-        assert.domEqual(span[0][1], span[0][2].previousSibling);
-        assert.domNull(span[0][2].nextSibling);
-        assert.deepEqual(span[0].slice(0, -1).map(data), [3, 10, 21]);
+        assert.domNull(span[0][1].nextSibling);
+        assert.deepEqual(span[0].slice(0, -2).map(data), [3, 21]);
 
         for (var i = 1; i < 4; ++i) {
           var d = span[i].parentNode.__data__;
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ d3_selectionPrototype.sort = function(comparator) {`
`10`	`10`	`function d3_selection_sortComparator(comparator) {`
`11`	`11`	`if (!arguments.length) comparator = d3.ascending;`
`12`	`12`	`return function(a, b) {`
`13`		`- return (!a - !b) \|\| comparator(a.__data__, b.__data__);`
	`13`	`+ return a && b ? comparator(a.__data__, b.__data__) : !a - !b;`
`14`	`14`	`};`
`15`	`15`	`}`