Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
mbostock committed Jun 14, 2011
2 parents 563b6d1 + 1cbda30 commit e2119b8
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion d3.behavior.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,4 @@ d3.behavior.zoom = function() {

return zoom;
};
})()
})();
2 changes: 1 addition & 1 deletion d3.chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -981,4 +981,4 @@ function d3_chart_qqX(d) {
function d3_chart_qqY(d) {
return d.y;
}
})()
})();
2 changes: 1 addition & 1 deletion d3.csv.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ function d3_csv_formatValue(text) {
? "\"" + text.replace(/\"/g, "\"\"") + "\""
: text;
}
})()
})();
2 changes: 1 addition & 1 deletion d3.geo.js
Original file line number Diff line number Diff line change
Expand Up @@ -563,4 +563,4 @@ function d3_geo_boundsPolygon(o, f) {
f.apply(null, a[i]);
}
}
})()
})();
2 changes: 1 addition & 1 deletion d3.geom.js
Original file line number Diff line number Diff line change
Expand Up @@ -825,4 +825,4 @@ function d3_geom_quadtreePoint(p) {
y: p[1]
};
}
})()
})();
4 changes: 2 additions & 2 deletions d3.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function(){d3 = {version: "1.20.2"}; // semver
(function(){d3 = {version: "1.20.3"}; // semver
if (!Date.now) Date.now = function() {
return +new Date;
};
Expand Down Expand Up @@ -3421,4 +3421,4 @@ d3.svg.symbolTypes = d3.keys(d3_svg_symbols);

var d3_svg_symbolSqrt3 = Math.sqrt(3),
d3_svg_symbolTan30 = Math.tan(30 * Math.PI / 180);
})()
})();
18 changes: 9 additions & 9 deletions d3.layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,14 @@ d3.layout.force = function() {
event = d3.dispatch("tick"),
size = [1, 1],
alpha,
drag = .9,
friction = .9,
distance = 20,
charge = -30,
gravity = .1,
theta = .8,
interval,
nodes,
links,
nodes = [],
links = [],
distances;

function repulse(node, kc) {
Expand Down Expand Up @@ -246,8 +246,8 @@ d3.layout.force = function() {
o.x = o.px;
o.y = o.py;
} else {
o.x -= (o.px - (o.px = o.x)) * drag;
o.y -= (o.py - (o.py = o.y)) * drag;
o.x -= (o.px - (o.px = o.x)) * friction;
o.y -= (o.py - (o.py = o.y)) * friction;
}
}

Expand Down Expand Up @@ -286,9 +286,9 @@ d3.layout.force = function() {
return force;
};

force.drag = function(x) {
if (!arguments.length) return drag;
drag = x;
force.friction = function(x) {
if (!arguments.length) return friction;
friction = x;
return force;
};

Expand Down Expand Up @@ -1760,4 +1760,4 @@ d3.layout.treemap = function() {

return d3_layout_hierarchyRebind(treemap, hierarchy);
};
})()
})();
2 changes: 1 addition & 1 deletion d3.layout.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion d3.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion d3.time.js
Original file line number Diff line number Diff line change
Expand Up @@ -310,4 +310,4 @@ function d3_time_zone(d) {
zm = Math.abs(z) % 60;
return zs + d3_time_zfill2(zh) + d3_time_zfill2(zm);
}
})()
})();
2 changes: 1 addition & 1 deletion src/core/core.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d3 = {version: "1.20.2"}; // semver
d3 = {version: "1.20.3"}; // semver
2 changes: 1 addition & 1 deletion src/end.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
})()
})();
16 changes: 8 additions & 8 deletions src/layout/force.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ d3.layout.force = function() {
event = d3.dispatch("tick"),
size = [1, 1],
alpha,
drag = .9,
friction = .9,
distance = 20,
charge = -30,
gravity = .1,
theta = .8,
interval,
nodes,
links,
nodes = [],
links = [],
distances;

function repulse(node, kc) {
Expand Down Expand Up @@ -94,8 +94,8 @@ d3.layout.force = function() {
o.x = o.px;
o.y = o.py;
} else {
o.x -= (o.px - (o.px = o.x)) * drag;
o.y -= (o.py - (o.py = o.y)) * drag;
o.x -= (o.px - (o.px = o.x)) * friction;
o.y -= (o.py - (o.py = o.y)) * friction;
}
}

Expand Down Expand Up @@ -134,9 +134,9 @@ d3.layout.force = function() {
return force;
};

force.drag = function(x) {
if (!arguments.length) return drag;
drag = x;
force.friction = function(x) {
if (!arguments.length) return friction;
friction = x;
return force;
};

Expand Down

0 comments on commit e2119b8

Please sign in to comment.