Skip to content

Commit 0103e25

Browse files
mbostockmbostock
committed
Minify the hard way.
1 parent cde0176 commit 0103e25

4 files changed

Lines changed: 30 additions & 29 deletions

File tree

‎d3.js‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2042,11 +2042,12 @@ d3 = function() {
20422042
if (n < 2) delay = 0;
20432043
if (n < 3) then = Date.now();
20442044
var time = then + delay, timer = {
2045-
callback: callback,
2046-
time: time,
2047-
next: null
2045+
c: callback,
2046+
t: time,
2047+
f: false,
2048+
n: null
20482049
};
2049-
if (d3_timer_queueTail) d3_timer_queueTail.next = timer; else d3_timer_queueHead = timer;
2050+
if (d3_timer_queueTail) d3_timer_queueTail.n = timer; else d3_timer_queueHead = timer;
20502051
d3_timer_queueTail = timer;
20512052
if (!d3_timer_interval) {
20522053
d3_timer_timeout = clearTimeout(d3_timer_timeout);
@@ -2075,19 +2076,19 @@ d3 = function() {
20752076
var now = Date.now();
20762077
d3_timer_active = d3_timer_queueHead;
20772078
while (d3_timer_active) {
2078-
if (now >= d3_timer_active.time) d3_timer_active.flush = d3_timer_active.callback(now - d3_timer_active.time);
2079-
d3_timer_active = d3_timer_active.next;
2079+
if (now >= d3_timer_active.t) d3_timer_active.f = d3_timer_active.c(now - d3_timer_active.t);
2080+
d3_timer_active = d3_timer_active.n;
20802081
}
20812082
return now;
20822083
}
20832084
function d3_timer_sweep() {
20842085
var t0, t1 = d3_timer_queueHead, time = Infinity;
20852086
while (t1) {
2086-
if (t1.flush) {
2087-
t1 = t0 ? t0.next = t1.next : d3_timer_queueHead = t1.next;
2087+
if (t1.f) {
2088+
t1 = t0 ? t0.n = t1.n : d3_timer_queueHead = t1.n;
20882089
} else {
2089-
if (t1.time < time) time = t1.time;
2090-
t1 = (t0 = t1).next;
2090+
if (t1.t < time) time = t1.t;
2091+
t1 = (t0 = t1).n;
20912092
}
20922093
}
20932094
d3_timer_queueTail = t0;
@@ -8105,9 +8106,9 @@ d3 = function() {
81058106
++lock.count;
81068107
d3.timer(function(elapsed) {
81078108
var d = node.__data__, ease = transition.ease, delay = transition.delay, duration = transition.duration, timer = d3_timer_active, tweened = [];
8108-
timer.time = delay + time;
8109+
timer.t = delay + time;
81098110
if (delay <= elapsed) return start(elapsed - delay);
8110-
timer.callback = start;
8111+
timer.c = start;
81118112
function start(elapsed) {
81128113
if (lock.active > id) return stop();
81138114
lock.active = id;
@@ -8118,7 +8119,7 @@ d3 = function() {
81188119
}
81198120
});
81208121
d3.timer(function() {
8121-
timer.callback = tick(elapsed || 1) ? d3_true : tick;
8122+
timer.c = tick(elapsed || 1) ? d3_true : tick;
81228123
return 1;
81238124
}, 0, time);
81248125
}

‎d3.min.js‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/event/timer.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ d3.timer = function(callback, delay, then) {
1515
if (n < 3) then = Date.now();
1616

1717
// Add the callback to the tail of the queue.
18-
var time = then + delay, timer = {callback: callback, time: time, next: null};
19-
if (d3_timer_queueTail) d3_timer_queueTail.next = timer;
18+
var time = then + delay, timer = {c: callback, t: time, f: false, n: null};
19+
if (d3_timer_queueTail) d3_timer_queueTail.n = timer;
2020
else d3_timer_queueHead = timer;
2121
d3_timer_queueTail = timer;
2222

@@ -52,8 +52,8 @@ function d3_timer_mark() {
5252
var now = Date.now();
5353
d3_timer_active = d3_timer_queueHead;
5454
while (d3_timer_active) {
55-
if (now >= d3_timer_active.time) d3_timer_active.flush = d3_timer_active.callback(now - d3_timer_active.time);
56-
d3_timer_active = d3_timer_active.next;
55+
if (now >= d3_timer_active.t) d3_timer_active.f = d3_timer_active.c(now - d3_timer_active.t);
56+
d3_timer_active = d3_timer_active.n;
5757
}
5858
return now;
5959
}
@@ -65,11 +65,11 @@ function d3_timer_sweep() {
6565
t1 = d3_timer_queueHead,
6666
time = Infinity;
6767
while (t1) {
68-
if (t1.flush) {
69-
t1 = t0 ? t0.next = t1.next : d3_timer_queueHead = t1.next;
68+
if (t1.f) {
69+
t1 = t0 ? t0.n = t1.n : d3_timer_queueHead = t1.n;
7070
} else {
71-
if (t1.time < time) time = t1.time;
72-
t1 = (t0 = t1).next;
71+
if (t1.t < time) time = t1.t;
72+
t1 = (t0 = t1).n;
7373
}
7474
}
7575
d3_timer_queueTail = t0;

‎src/transition/transition.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ function d3_transitionNode(node, i, id, inherit) {
7171
timer = d3_timer_active,
7272
tweened = [];
7373

74-
timer.time = delay + time;
74+
timer.t = delay + time;
7575
if (delay <= elapsed) return start(elapsed - delay);
76-
timer.callback = start;
76+
timer.c = start;
7777

7878
function start(elapsed) {
7979
if (lock.active > id) return stop();
@@ -87,7 +87,7 @@ function d3_transitionNode(node, i, id, inherit) {
8787
});
8888

8989
d3.timer(function() { // defer to end of current frame
90-
timer.callback = tick(elapsed || 1) ? d3_true : tick;
90+
timer.c = tick(elapsed || 1) ? d3_true : tick;
9191
return 1;
9292
}, 0, time);
9393
}

0 commit comments

Comments
 (0)