Permalink
Browse files

Merge branch '2.10.0'

  • Loading branch information...
mbostock committed Aug 10, 2012
2 parents 108d65d + ee03eb6 commit b0686e2a5d6ed18ddae52219224895640264db06
Showing with 1,975 additions and 976 deletions.
  1. +12 −5 Makefile
  2. +467 −329 d3.v2.js
  3. +4 −4 d3.v2.min.js
  4. +0 −5 examples/bubble/bubble.css
  5. +2 −1 examples/bubble/bubble.js
  6. +2 −0 examples/data/sample.tsv
  7. +5 −2 examples/transform/null-matrix.html
  8. +5 −2 examples/transform/null.html
  9. +40 −0 examples/transform/test-rotate-origin.html
  10. +9 −5 examples/transform/test-rotate.html
  11. +1 −1 package.json
  12. +1 −1 src/core/collapse.js
  13. +1 −1 src/core/core.js
  14. +1 −1 src/core/format.js
  15. +37 −0 src/core/hcl.js
  16. +32 −111 src/core/interpolate.js
  17. +63 −0 src/core/lab.js
  18. +20 −4 src/core/random.js
  19. +14 −0 src/core/rgb.js
  20. +28 −13 src/core/selection-attr.js
  21. +60 −44 src/core/selection-classed.js
  22. +40 −25 src/core/selection-on.js
  23. +23 −5 src/core/selection-property.js
  24. +37 −8 src/core/selection-style.js
  25. +12 −3 src/core/transition-attr.js
  26. +21 −3 src/core/transition-style.js
  27. +0 −25 src/core/transition.js
  28. +27 −0 src/core/tween.js
  29. +7 −0 src/core/xyz.js
  30. +0 −5 src/csv/csv.js
  31. +0 −13 src/csv/format.js
  32. +0 −73 src/csv/parse.js
  33. +1 −0 src/dsv/csv.js
  34. +97 −0 src/dsv/dsv.js
  35. +1 −0 src/dsv/tsv.js
  36. +37 −27 src/layout/pack.js
  37. +1 −1 src/scale/linear.js
  38. +3 −4 src/scale/nice.js
  39. +14 −12 src/scale/ordinal.js
  40. +28 −0 src/scale/threshold.js
  41. +11 −11 src/svg/area.js
  42. +12 −9 src/svg/line.js
  43. +14 −0 src/time/format-en_US.js
  44. +14 −0 src/time/format-fr_FR.js
  45. +10 −0 src/time/format-ru_RU.js
  46. +33 −64 src/time/format.js
  47. +1 −2 src/time/scale.js
  48. +2 −1 src/time/time.js
  49. +1 −1 src/time/week.js
  50. +31 −31 test/core/format-test.js
  51. +89 −0 test/core/hcl-test.js
  52. +89 −0 test/core/lab-test.js
  53. +35 −0 test/core/random-test.js
  54. +23 −0 test/core/selection-attr-test.js
  55. +89 −44 test/core/selection-classed-test.js
  56. +11 −1 test/core/selection-on-test.js
  57. +20 −0 test/core/selection-property-test.js
  58. +24 −0 test/core/selection-style-test.js
  59. +0 −36 test/csv/csv-test.js
  60. +0 −37 test/csv/format-test.js
  61. +54 −1 test/{csv/parse-test.js → dsv/csv-test.js}
  62. +155 −0 test/dsv/tsv-test.js
  63. +2 −0 test/scale/linear-test.js
  64. +6 −4 test/scale/log-test.js
  65. +16 −0 test/scale/ordinal-test.js
  66. +1 −1 test/scale/sqrt-test.js
  67. +52 −0 test/scale/threshold-test.js
  68. +9 −0 test/svg/line-test.js
  69. +18 −0 test/time/scale-test.js
View
@@ -4,6 +4,7 @@ NODE_PATH ?= ./node_modules
JS_COMPILER = $(NODE_PATH)/uglify-js/bin/uglifyjs
JS_BEAUTIFIER = $(NODE_PATH)/uglify-js/bin/uglifyjs -b -i 2 -nm -ns
JS_TESTER = $(NODE_PATH)/vows/bin/vows
+LOCALE ?= en_US
all: \
d3.v2.js \
@@ -19,7 +20,7 @@ all: \
d3.svg.js \
d3.behavior.js \
d3.layout.js \
- d3.csv.js \
+ d3.dsv.js \
d3.geo.js \
d3.geom.js \
d3.time.js \
@@ -80,6 +81,9 @@ d3.core.js: \
src/core/uninterpolate.js \
src/core/rgb.js \
src/core/hsl.js \
+ src/core/hcl.js \
+ src/core/lab.js \
+ src/core/xyz.js \
src/core/selection.js \
src/core/selection-select.js \
src/core/selection-selectAll.js \
@@ -118,6 +122,7 @@ d3.core.js: \
src/core/transition-duration.js \
src/core/transition-each.js \
src/core/transition-transition.js \
+ src/core/tween.js \
src/core/timer.js \
src/core/mouse.js \
src/core/touches.js \
@@ -136,6 +141,7 @@ d3.scale.js: \
src/scale/category.js \
src/scale/quantile.js \
src/scale/quantize.js \
+ src/scale/threshold.js \
src/scale/identity.js
d3.svg.js: \
@@ -188,13 +194,14 @@ d3.geo.js: \
src/geo/greatArc.js \
src/geo/greatCircle.js
-d3.csv.js: \
- src/csv/csv.js \
- src/csv/parse.js \
- src/csv/format.js
+d3.dsv.js: \
+ src/dsv/dsv.js \
+ src/dsv/csv.js \
+ src/dsv/tsv.js
d3.time.js: \
src/time/time.js \
+ src/time/format-$(LOCALE).js \
src/time/format.js \
src/time/format-utc.js \
src/time/format-iso.js \
Oops, something went wrong.

0 comments on commit b0686e2

Please sign in to comment.