Skip to content

Commit 8a3a7eb

Browse files
mbostockmbostock
committed
Merge branch 'parentheses' of git://github.com/jasondavies/d3 into 2.10.1
2 parents 0c1d23d + 82af000 commit 8a3a7eb

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎src/core/format.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ d3.format = function(specifier) {
3838
if (integer && (value % 1)) return "";
3939

4040
// Convert negative to positive, and record the sign prefix.
41-
var negative = (value < 0) && (value = -value) ? "-" : sign;
41+
var negative = value < 0 && (value = -value) ? "-" : sign;
4242

4343
// Apply the scale, computing it from the value's exponent for si format.
4444
if (scale < 0) {

‎src/core/interpolate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function d3_interpolateByName(name) {
254254

255255
d3.interpolators = [
256256
d3.interpolateObject,
257-
function(a, b) { return (b instanceof Array) && d3.interpolateArray(a, b); },
257+
function(a, b) { return b instanceof Array && d3.interpolateArray(a, b); },
258258
function(a, b) { return (typeof a === "string" || typeof b === "string") && d3.interpolateString(a + "", b + ""); },
259259
function(a, b) { return (typeof b === "string" ? d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Rgb || b instanceof d3_Hsl) && d3.interpolateRgb(a, b); },
260260
function(a, b) { return !isNaN(a = +a) && !isNaN(b = +b) && d3.interpolateNumber(a, b); }

‎src/core/mouse.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function d3_mousePoint(container, e) {
99
var svg = container.ownerSVGElement || container;
1010
if (svg.createSVGPoint) {
1111
var point = svg.createSVGPoint();
12-
if ((d3_mouse_bug44083 < 0) && (window.scrollX || window.scrollY)) {
12+
if (d3_mouse_bug44083 < 0 && (window.scrollX || window.scrollY)) {
1313
svg = d3.select(document.body)
1414
.append("svg")
1515
.style("position", "absolute")

‎src/dsv/dsv.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function d3_dsv(delimiter, mimeType) {
7070

7171
while ((t = token()) !== EOF) {
7272
var a = [];
73-
while ((t !== EOL) && (t !== EOF)) {
73+
while (t !== EOL && t !== EOF) {
7474
a.push(t);
7575
t = token();
7676
}

‎src/layout/histogram.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ d3.layout.histogram = function() {
2727
if (m > 0) {
2828
i = -1; while(++i < n) {
2929
x = values[i];
30-
if ((x >= range[0]) && (x <= range[1])) {
30+
if (x >= range[0] && x <= range[1]) {
3131
bin = bins[d3.bisect(thresholds, x, 1, m) - 1];
3232
bin.y += k;
3333
bin.push(data[i]);

0 commit comments

Comments
 (0)