Skip to content

Commit 7c461b2

Browse files
jasondaviesjasondavies
committed
Merge branch 'master' into kde
Conflicts: Makefile d3.js d3.min.js src/core/sum.js
2 parents d9b98e2 + 489eb0c commit 7c461b2

162 files changed

Lines changed: 5209 additions & 1055 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ d3.core.js: \
3838
src/core/min.js \
3939
src/core/max.js \
4040
src/core/sum.js \
41+
src/core/zip.js \
4142
src/core/bisect.js \
43+
src/core/first.js \
44+
src/core/last.js \
4245
src/core/nest.js \
4346
src/core/keys.js \
4447
src/core/values.js \
@@ -71,6 +74,7 @@ d3.core.js: \
7174

7275
d3.scale.js: \
7376
src/scale/scale.js \
77+
src/scale/nice.js \
7478
src/scale/linear.js \
7579
src/scale/bilinear.js \
7680
src/scale/polylinear.js \
@@ -86,9 +90,12 @@ d3.svg.js: \
8690
src/svg/svg.js \
8791
src/svg/arc.js \
8892
src/svg/line.js \
93+
src/svg/line-radial.js \
8994
src/svg/area.js \
95+
src/svg/area-radial.js \
9096
src/svg/chord.js \
9197
src/svg/diagonal.js \
98+
src/svg/diagonal-radial.js \
9299
src/svg/mouse.js \
93100
src/svg/touches.js \
94101
src/svg/symbol.js
@@ -104,12 +111,14 @@ d3.chart.js: \
104111
src/chart/chart.js \
105112
src/chart/box.js \
106113
src/chart/bullet.js \
114+
src/chart/horizon.js \
107115
src/chart/qq.js \
108116
src/end.js
109117

110118
d3.layout.js: \
111119
src/start.js \
112120
src/layout/layout.js \
121+
src/layout/bundle.js \
113122
src/layout/chord.js \
114123
src/layout/force.js \
115124
src/layout/partition.js \
@@ -126,6 +135,7 @@ d3.layout.js: \
126135
d3.geo.js: \
127136
src/start.js \
128137
src/geo/geo.js \
138+
src/geo/azimuthal.js \
129139
src/geo/albers.js \
130140
src/geo/mercator.js \
131141
src/geo/path.js \
@@ -143,6 +153,8 @@ d3.time.js: \
143153
src/start.js \
144154
src/time/time.js \
145155
src/time/format.js \
156+
src/time/format-utc.js \
157+
src/time/format-iso.js \
146158
src/end.js
147159

148160
d3.geom.js: \
@@ -166,14 +178,22 @@ tests: \
166178
tests/test-insert.test \
167179
tests/test-interpolate.test \
168180
tests/test-keys.test \
181+
tests/test-max.test \
182+
tests/test-min.test \
183+
tests/test-sum.test \
169184
tests/test-nest.test \
170185
tests/test-permute.test \
186+
tests/test-zip.test \
171187
tests/test-remove.test \
172188
tests/test-rgb.test \
173189
tests/test-round.test \
174190
tests/test-hsl.test \
175191
tests/test-time-format.test \
192+
tests/test-time-format-iso.test \
193+
tests/test-time-format-utc.test \
176194
tests/test-time-parse.test \
195+
tests/test-time-parse-iso.test \
196+
tests/test-time-parse-utc.test \
177197
tests/test-transition.test \
178198
tests/test-scale-linear.test \
179199
tests/test-scale-polylinear.test \

‎d3.behavior.js‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
// TODO unbind listener?
44
d3.behavior.zoom = function() {
55

6-
// https://bugs.webkit.org/show_bug.cgi?id=40441
7-
var bug40441 = /WebKit\/533/.test(navigator.userAgent) ? -1 : 0,
8-
bug40441Last = 0,
9-
x = 0,
6+
var x = 0,
107
y = 0,
118
z = 0,
129
listeners = [],
@@ -53,6 +50,20 @@ d3.behavior.zoom = function() {
5350
}
5451
}
5552

53+
// mousewheel events are totally broken!
54+
// https://bugs.webkit.org/show_bug.cgi?id=40441
55+
// not only that, but Chrome and Safari differ in re. to acceleration!
56+
57+
var outer = d3.select("body").append("div")
58+
.style("visibility", "hidden")
59+
.style("position", "absolute")
60+
.style("top", "-3000px")
61+
.style("height", 0)
62+
.style("overflow-y", "scroll")
63+
.append("div")
64+
.style("height", "2000px")
65+
.node().parentNode;
66+
5667
function mousewheel(d, i) {
5768
var e = d3.event;
5869

@@ -72,16 +83,17 @@ d3.behavior.zoom = function() {
7283
if (e.type === "dblclick") {
7384
z = e.shiftKey ? Math.ceil(z - 1) : Math.floor(z + 1);
7485
} else {
75-
var delta = (e.wheelDelta / 120 || -e.detail) * .1;
76-
77-
/* Detect fast & large wheel events on WebKit. */
78-
if (bug40441 < 0) {
79-
var now = Date.now(), since = now - bug40441Last;
80-
if ((since > 9) && (Math.abs(e.wheelDelta) / since >= 50)) bug40441 = 1;
81-
bug40441Last = now;
86+
var delta = e.wheelDelta || -e.detail;
87+
if (delta) {
88+
try {
89+
outer.scrollTop = 1000;
90+
outer.dispatchEvent(e);
91+
delta = 1000 - outer.scrollTop;
92+
} catch (error) {
93+
// Derp! Hope for the best?
94+
}
95+
delta *= .005;
8296
}
83-
if (bug40441 === 1) delta *= .03;
84-
8597
z += delta;
8698
}
8799

@@ -129,4 +141,4 @@ d3.behavior.zoom = function() {
129141

130142
return zoom;
131143
};
132-
})()
144+
})();

‎d3.behavior.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)