Skip to content

Commit 46472b1

Browse files
committed
Merge branch 'patch-3' of git://github.com/LeoDutra/d3 into micro-optimizations
Conflicts: src/core/array.js
2 parents c234c58 + ab68440 commit 46472b1

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

d3.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ d3 = function() {
2121
};
2222
}
2323
d3.ascending = function(a, b) {
24-
return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
24+
return a < b ? -1 : a > b ? 1 : a === b ? 0 : NaN;
2525
};
2626
d3.descending = function(a, b) {
27-
return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
27+
return b < a ? -1 : b > a ? 1 : b === a ? 0 : NaN;
2828
};
2929
d3.min = function(array, f) {
3030
var i = -1, n = array.length, a, b;
@@ -75,7 +75,7 @@ d3 = function() {
7575
return s;
7676
};
7777
function d3_number(x) {
78-
return x != null && !isNaN(x);
78+
return !(x == null || isNaN(x));
7979
}
8080
d3.mean = function(array, f) {
8181
var n = array.length, a, m = 0, i = -1, j = 0;
@@ -131,8 +131,8 @@ d3 = function() {
131131
return array;
132132
};
133133
d3.permute = function(array, indexes) {
134-
var permutes = [], i = -1, n = indexes.length;
135-
while (++i < n) permutes[i] = array[indexes[i]];
134+
var i = indexes.length, permutes = Array(i);
135+
while (i--) permutes[i] = array[indexes[i]];
136136
return permutes;
137137
};
138138
d3.zip = function() {
@@ -320,7 +320,7 @@ d3 = function() {
320320
};
321321
d3.set = function(array) {
322322
var set = new d3_Set();
323-
if (array) for (var i = 0; i < array.length; i++) set.add(array[i]);
323+
if (array) for (var i = 0, n = array.length; i < n; ++i) set.add(array[i]);
324324
return set;
325325
};
326326
function d3_Set() {}
@@ -374,8 +374,8 @@ d3 = function() {
374374
var d3_vendorPrefixes = [ "webkit", "ms", "moz", "Moz", "o", "O" ];
375375
var d3_array = d3_arraySlice;
376376
function d3_arrayCopy(pseudoarray) {
377-
var i = -1, n = pseudoarray.length, array = [];
378-
while (++i < n) array.push(pseudoarray[i]);
377+
var i = pseudoarray.length, array = new Array(i);
378+
while (i--) array[i] = pseudoarray[i];
379379
return array;
380380
}
381381
function d3_arraySlice(pseudoarray) {

0 commit comments

Comments
 (0)