Skip to content

Commit 7b37e7d

Browse files
committed
Merge branch 'force_layout_keeps_userbits_intact' of https://github.com/GerHobbelt/d3 into fix-force-drag
2 parents 772009d + 53897c8 commit 7b37e7d

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

d3.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4283,14 +4283,14 @@
42834283
d.fixed |= 2;
42844284
}
42854285
function d3_layout_forceDragend(d) {
4286-
d.fixed &= 1;
4286+
d.fixed &= ~6;
42874287
}
42884288
function d3_layout_forceMouseover(d) {
42894289
d.fixed |= 4;
42904290
d.px = d.x, d.py = d.y;
42914291
}
42924292
function d3_layout_forceMouseout(d) {
4293-
d.fixed &= 3;
4293+
d.fixed &= ~4;
42944294
}
42954295
function d3_layout_forceAccumulate(quad, alpha, charges) {
42964296
var cx = 0, cy = 0;

0 commit comments

Comments
 (0)