app/assets/javascripts/d3.js in d3_rails-3.4.5 vs app/assets/javascripts/d3.js in d3_rails-3.4.6
- old
+ new
@@ -1,8 +1,8 @@
!function() {
var d3 = {
- version: "3.4.5"
+ version: "3.4.6"
};
if (!Date.now) Date.now = function() {
return +new Date();
};
var d3_arraySlice = [].slice, d3_array = function(list) {
@@ -89,17 +89,17 @@
};
function d3_number(x) {
return x != null && !isNaN(x);
}
d3.mean = function(array, f) {
- var n = array.length, a, m = 0, i = -1, j = 0;
+ var s = 0, n = array.length, a, i = -1, j = n;
if (arguments.length === 1) {
- while (++i < n) if (d3_number(a = array[i])) m += (a - m) / ++j;
+ while (++i < n) if (d3_number(a = array[i])) s += a; else --j;
} else {
- while (++i < n) if (d3_number(a = f.call(array, array[i], i))) m += (a - m) / ++j;
+ while (++i < n) if (d3_number(a = f.call(array, array[i], i))) s += a; else --j;
}
- return j ? m : undefined;
+ return j ? s / j : undefined;
};
d3.quantile = function(values, p) {
var H = (values.length - 1) * p + 1, h = Math.floor(H), v = +values[h - 1], e = H - h;
return e ? v + e * (values[h] - v) : v;
};
@@ -2673,11 +2673,11 @@
d3_time_numberRe.lastIndex = 0;
var n = d3_time_numberRe.exec(string.substring(i, i + 2));
return n ? (date.y = d3_time_expandYear(+n[0]), i + n[0].length) : -1;
}
function d3_time_parseZone(date, string, i) {
- return /^[+-]\d{4}$/.test(string = string.substring(i, i + 5)) ? (date.Z = +string,
+ return /^[+-]\d{4}$/.test(string = string.substring(i, i + 5)) ? (date.Z = -string,
i + 5) : -1;
}
function d3_time_expandYear(d) {
return d + (d > 68 ? 1900 : 2e3);
}
@@ -7701,12 +7701,10 @@
function scale(x) {
if (!isNaN(x = +x)) return range[d3.bisect(thresholds, x)];
}
scale.domain = function(x) {
if (!arguments.length) return domain;
- domain = x.filter(function(d) {
- return !isNaN(d);
- }).sort(d3_ascending);
+ domain = x.filter(d3_number).sort(d3_ascending);
return rescale();
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
\ No newline at end of file