Permalink
Browse files

Merge branch 'release'

  • Loading branch information...
2 parents ed71513 + 80a4078 commit ceb5f7cc94b3fc8400ed900a6dc6a7354191c5b6 @mbostock mbostock committed Aug 15, 2011
Showing with 7,136 additions and 43,383 deletions.
  1. +2 −82 Makefile
  2. +1 −1 d3.csv.js
  3. +1 −1 d3.csv.min.js
  4. +2 −2 d3.js
  5. +3 −3 d3.layout.js
  6. +1 −1 d3.layout.min.js
  7. +2 −2 d3.min.js
  8. +0 −20 lib/env-js/LICENSE
  9. +0 −39 lib/env-js/bin/envjs
  10. +0 −278 lib/env-js/envjs/console.js
  11. +0 −695 lib/env-js/envjs/css.js
  12. +0 −8,972 lib/env-js/envjs/dom.js
  13. +0 −720 lib/env-js/envjs/event.js
  14. +0 −4,997 lib/env-js/envjs/html.js
  15. +0 −66 lib/env-js/envjs/johnson.js
  16. +0 −31 lib/env-js/envjs/johnson.rb
  17. +0 −7 lib/env-js/envjs/node.js
  18. +0 −14,465 lib/env-js/envjs/parser.js
  19. +0 −3,041 lib/env-js/envjs/platform/core.js
  20. +0 −363 lib/env-js/envjs/platform/johnson.js
  21. +0 −343 lib/env-js/envjs/platform/node.js
  22. +0 −461 lib/env-js/envjs/platform/rhino.js
  23. +0 −340 lib/env-js/envjs/platform/rubyracer.js
  24. +0 −352 lib/env-js/envjs/platform/spydermonkey.js
  25. +0 −91 lib/env-js/envjs/rhino.js
  26. +0 −72 lib/env-js/envjs/rubyracer.js
  27. +0 −90 lib/env-js/envjs/rubyracer.rb
  28. +0 −64 lib/env-js/envjs/spydermonkey.js
  29. +0 −56 lib/env-js/envjs/spydermonkey.py
  30. +0 −864 lib/env-js/envjs/window.js
  31. +0 −566 lib/env-js/envjs/xhr.js
  32. +0 −39 lib/env-js/local_settings.js
  33. +1 −1 src/core/core.js
  34. +1 −1 src/core/interpolate.js
  35. +1 −1 src/csv/parse.js
  36. +2 −2 src/layout/hierarchy.js
  37. +1 −1 src/layout/partition.js
  38. +0 −122 test/barley.json
  39. +37 −0 test/core/ascending-test.js
  40. +103 −0 test/core/bisect-test.js
  41. +37 −0 test/core/descending-test.js
  42. +43 −0 test/core/entries-test.js
  43. +200 −0 test/core/format-test.js
  44. +87 −0 test/core/hsl-test.js
  45. +203 −0 test/core/interpolate-test.js
  46. +31 −0 test/core/keys-test.js
  47. +50 −0 test/core/max-test.js
  48. +50 −0 test/core/min-test.js
  49. +236 −0 test/core/nest-test.js
  50. +53 −0 test/core/ns-test.js
  51. +53 −0 test/core/permute-test.js
  52. +89 −0 test/core/rgb-test.js
  53. +70 −0 test/core/round-test.js
  54. +42 −0 test/core/select-test.js
  55. +42 −0 test/core/selectAll-test.js
  56. +119 −0 test/core/selection-append-test.js
  57. +153 −0 test/core/selection-attr-test.js
  58. +71 −0 test/core/selection-call-test.js
  59. +200 −0 test/core/selection-classed-test.js
  60. +165 −0 test/core/selection-data-test.js
  61. +83 −0 test/core/selection-each-test.js
  62. +51 −0 test/core/selection-empty-test.js
  63. +63 −0 test/core/selection-filter-test.js
  64. +121 −0 test/core/selection-html-test.js
  65. +132 −0 test/core/selection-insert-test.js
  66. +47 −0 test/core/selection-map-test.js
  67. +50 −0 test/core/selection-node-test.js
  68. +87 −0 test/core/selection-on-test.js
  69. +91 −0 test/core/selection-property-test.js
  70. +39 −0 test/core/selection-remove-test.js
  71. +105 −0 test/core/selection-select-test.js
  72. +105 −0 test/core/selection-selectAll-test.js
  73. +59 −0 test/core/selection-sort-test.js
  74. +100 −0 test/core/selection-style-test.js
  75. +109 −0 test/core/selection-text-test.js
  76. +47 −0 test/core/sum-test.js
  77. +0 −15 test/core/test-append.js
  78. +0 −6 test/core/test-append.out
  79. +0 −24 test/core/test-attr.js
  80. +0 −16 test/core/test-attr.out
  81. +0 −66 test/core/test-bisect.js
  82. +0 −53 test/core/test-bisect.out
  83. +0 −21 test/core/test-call.js
  84. +0 −10 test/core/test-call.out
  85. +0 −40 test/core/test-classed.js
  86. +0 −23 test/core/test-classed.out
  87. +0 −194 test/core/test-format.js
  88. +0 −172 test/core/test-format.out
  89. +0 −51 test/core/test-hsl.js
  90. +0 −42 test/core/test-hsl.out
  91. +0 −22 test/core/test-insert.js
  92. +0 −9 test/core/test-insert.out
  93. +0 −87 test/core/test-interpolate.js
  94. +0 −63 test/core/test-interpolate.out
  95. +0 −17 test/core/test-keys.js
  96. +0 −6 test/core/test-keys.out
  97. +0 −43 test/core/test-max.js
  98. +0 −31 test/core/test-max.out
  99. +0 −43 test/core/test-min.js
  100. +0 −31 test/core/test-min.out
  101. +0 −60 test/core/test-nest.js
  102. +0 −194 test/core/test-nest.out
  103. +0 −38 test/core/test-permute.js
  104. +0 −27 test/core/test-permute.out
  105. +0 −22 test/core/test-remove.js
  106. +0 −9 test/core/test-remove.out
  107. +0 −51 test/core/test-rgb.js
  108. +0 −42 test/core/test-rgb.out
  109. +0 −75 test/core/test-round.js
  110. +0 −66 test/core/test-round.out
  111. +0 −31 test/core/test-sum.js
  112. +0 −25 test/core/test-sum.out
  113. +0 −18 test/core/test-transition.js
  114. +0 −6 test/core/test-transition.out
  115. +0 −24 test/core/test-zip.js
  116. +0 −15 test/core/test-zip.out
  117. +44 −0 test/core/transition-test.js
  118. +35 −0 test/core/values-test.js
  119. +18 −0 test/core/version-test.js
  120. +32 −0 test/core/zip-test.js
  121. +101 −0 test/csv/parse-test.js
  122. +0 −18 test/csv/test-parse.js
  123. +0 −9 test/csv/test-parse.out
  124. +81 −0 test/env.js
  125. +91 −0 test/layout/histogram-test.js
  126. +39 −0 test/layout/partition-test.js
  127. +0 −29 test/layout/test-histogram.js
  128. +0 −12 test/layout/test-histogram.out
  129. +0 −71 test/layout/test-treemap.js
  130. +0 −52 test/layout/test-treemap.out
  131. +150 −0 test/layout/treemap-test.js
  132. +146 −0 test/scale/linear-test.js
  133. +145 −0 test/scale/log-test.js
  134. +76 −0 test/scale/ordinal-test.js
  135. +340 −0 test/scale/pow-test.js
  136. +64 −0 test/scale/quantile-test.js
  137. +0 −116 test/scale/test-linear.js
  138. +0 −84 test/scale/test-linear.out
  139. +0 −108 test/scale/test-log.js
  140. +0 −80 test/scale/test-log.out
  141. +0 −79 test/scale/test-ordinal.js
  142. +0 −61 test/scale/test-ordinal.out
  143. +0 −37 test/scale/test-polylinear.js
  144. +0 −28 test/scale/test-polylinear.out
  145. +0 −85 test/scale/test-pow.js
  146. +0 −61 test/scale/test-pow.out
  147. +0 −142 test/scale/test-quantile.js
  148. +0 −105 test/scale/test-quantile.out
  149. +0 −51 test/scale/test-sqrt.js
  150. +0 −36 test/scale/test-sqrt.out
  151. +28 −0 test/svg/arc-test.js
  152. +95 −0 test/svg/area-test.js
  153. +83 −0 test/svg/line-test.js
  154. +96 −0 test/svg/symbol-test.js
  155. +0 −12 test/svg/test-arc.js
  156. +0 −6 test/svg/test-arc.out
  157. +0 −123 test/svg/test-area.js
  158. +0 −65 test/svg/test-area.out
  159. +0 −93 test/svg/test-line.js
  160. +0 −50 test/svg/test-line.out
  161. +0 −63 test/svg/test-symbol.js
  162. +0 −43 test/svg/test-symbol.out
  163. +65 −0 test/time/day-test.js
  164. +105 −0 test/time/days-test.js
  165. +430 −0 test/time/format-test.js
  166. +103 −0 test/time/hour-test.js
  167. +135 −0 test/time/hours-test.js
  168. +43 −0 test/time/minute-test.js
  169. +101 −0 test/time/minutes-test.js
  170. +53 −0 test/time/month-test.js
  171. +105 −0 test/time/months-test.js
  172. +471 −0 test/time/scale-test.js
  173. +41 −0 test/time/second-test.js
  174. +101 −0 test/time/seconds-test.js
  175. +0 −22 test/time/test-day.js
  176. +0 −14 test/time/test-day.out
  177. +0 −34 test/time/test-days.js
  178. +0 −31 test/time/test-days.out
  179. +0 −8 test/time/test-format-iso.js
  180. +0 −4 test/time/test-format-iso.out
  181. +0 −22 test/time/test-format-utc.js
  182. +0 −50 test/time/test-format-utc.out
  183. +0 −22 test/time/test-format.js
  184. +0 −50 test/time/test-format.out
  185. +0 −65 test/time/test-hour.js
  186. +0 −48 test/time/test-hour.out
  187. +0 −34 test/time/test-hours.js
  188. +0 −46 test/time/test-hours.out
  189. +0 −20 test/time/test-minute.js
  190. +0 −12 test/time/test-minute.out
  191. +0 −30 test/time/test-minutes.js
  192. +0 −32 test/time/test-minutes.out
  193. +0 −22 test/time/test-month.js
  194. +0 −14 test/time/test-month.out
  195. +0 −34 test/time/test-months.js
  196. +0 −34 test/time/test-months.out
  197. +0 −10 test/time/test-parse-iso.js
  198. +0 −4 test/time/test-parse-iso.out
  199. +0 −80 test/time/test-parse-utc.js
  200. +0 −64 test/time/test-parse-utc.out
  201. +0 −79 test/time/test-parse.js
  202. +0 −64 test/time/test-parse.out
  203. +0 −178 test/time/test-scale-utc.js
  204. +0 −492 test/time/test-scale-utc.out
  205. +0 −174 test/time/test-scale.js
  206. +0 −496 test/time/test-scale.out
  207. +0 −22 test/time/test-second.js
  208. +0 −14 test/time/test-second.out
  209. +0 −30 test/time/test-seconds.js
  210. +0 −40 test/time/test-seconds.out
  211. +0 −22 test/time/test-week.js
  212. +0 −14 test/time/test-week.out
  213. +0 −34 test/time/test-weeks.js
  214. +0 −51 test/time/test-weeks.out
  215. +0 −22 test/time/test-year.js
  216. +0 −14 test/time/test-year.out
  217. +0 −34 test/time/test-years.js
  218. +0 −38 test/time/test-years.out
  219. +59 −0 test/time/week-test.js
  220. +105 −0 test/time/weeks-test.js
  221. +41 −0 test/time/year-test.js
  222. +73 −0 test/time/years-test.js
View
@@ -187,81 +187,8 @@ d3.geom.js: \
src/geom/quadtree.js \
src/end.js
-test: \
- test/core \
- test/csv \
- test/layout \
- test/scale \
- test/svg \
- test/time
-
-test/core: \
- test/core/test-append.test \
- test/core/test-attr.test \
- test/core/test-bisect.test \
- test/core/test-call.test \
- test/core/test-classed.test \
- test/core/test-format.test \
- test/core/test-hsl.test \
- test/core/test-insert.test \
- test/core/test-interpolate.test \
- test/core/test-keys.test \
- test/core/test-max.test \
- test/core/test-min.test \
- test/core/test-nest.test \
- test/core/test-permute.test \
- test/core/test-remove.test \
- test/core/test-rgb.test \
- test/core/test-round.test \
- test/core/test-sum.test \
- test/core/test-transition.test \
- test/core/test-zip.test
-
-test/csv: \
- test/csv/test-parse.test
-
-test/layout: \
- test/layout/test-histogram.test \
- test/layout/test-treemap.test
-
-test/scale: \
- test/scale/test-linear.test \
- test/scale/test-log.test \
- test/scale/test-polylinear.test \
- test/scale/test-pow.test \
- test/scale/test-quantile.test \
- test/scale/test-sqrt.test \
- test/scale/test-ordinal.test
-
-test/svg: \
- test/svg/test-arc.test \
- test/svg/test-area.test \
- test/svg/test-line.test \
- test/svg/test-symbol.test
-
-test/time: \
- test/time/test-day.test \
- test/time/test-days.test \
- test/time/test-format-iso.test \
- test/time/test-format-utc.test \
- test/time/test-format.test \
- test/time/test-hour.test \
- test/time/test-hours.test \
- test/time/test-minute.test \
- test/time/test-minutes.test \
- test/time/test-month.test \
- test/time/test-months.test \
- test/time/test-parse-iso.test \
- test/time/test-parse-utc.test \
- test/time/test-parse.test \
- test/time/test-scale.test \
- test/time/test-scale-utc.test \
- test/time/test-second.test \
- test/time/test-seconds.test \
- test/time/test-week.test \
- test/time/test-weeks.test \
- test/time/test-year.test \
- test/time/test-years.test
+test: all
+ @vows
%.min.js: %.js Makefile
@rm -f $@
@@ -272,12 +199,5 @@ d3.js d3%.js: Makefile
cat $(filter %.js,$^) > $@
@chmod a-w $@
-%.test: %.js %.out all
- @/bin/echo -n "test: $* "
- @node $< > $*.actual
- @diff -U 3 $*.out $*.actual && rm -f $*.actual \
- && echo '\033[1;32mPASS\033[0m' \
- || echo test: $* '\033[1;31mFAIL\033[0m'
-
clean:
rm -f d3*.js
View
@@ -30,7 +30,7 @@ d3.csv.parseRows = function(text, f) {
/** @private Returns the next token. */
function token() {
- if (re.lastIndex === text.length) return EOF; // special case: end of file
+ if (re.lastIndex >= text.length) return EOF; // special case: end of file
if (eol) { eol = false; return EOL; } // special case: end of line
// special case: quotes
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
4 d3.js
@@ -1,4 +1,4 @@
-(function(){d3 = {version: "1.29.1"}; // semver
+(function(){d3 = {version: "1.29.2"}; // semver
if (!Date.now) Date.now = function() {
return +new Date;
};
@@ -836,7 +836,7 @@ d3.interpolators = [
d3.interpolateObject,
function(a, b) { return (b instanceof Array) && d3.interpolateArray(a, b); },
function(a, b) { return (typeof b === "string") && d3.interpolateString(String(a), b); },
- function(a, b) { return (b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b)) && d3.interpolateRgb(String(a), b); },
+ function(a, b) { return (typeof b === "string" ? b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Rgb || b instanceof d3_Hsl) && d3.interpolateRgb(String(a), b); },
function(a, b) { return (typeof b === "number") && d3.interpolateNumber(+a, b); }
];
function d3_uninterpolateNumber(a, b) {
View
@@ -609,7 +609,7 @@ d3.layout.partition = function() {
n = children.length,
c,
d;
- dx /= node.value;
+ dx = node.value ? dx / node.value : 0;
while (++i < n) {
position(c = children[i], x, d = c.value * dx, dy);
x += d;
@@ -1103,7 +1103,7 @@ d3.layout.hierarchy = function() {
if (sort) c.sort(sort);
if (value) node.value = v;
} else if (value) {
- node.value = value.call(hierarchy, data, depth);
+ node.value = +value.call(hierarchy, data, depth) || 0;
}
return node;
}
@@ -1118,7 +1118,7 @@ d3.layout.hierarchy = function() {
j = depth + 1;
while (++i < n) v += revalue(children[i], j);
} else if (value) {
- v = value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth);
+ v = +value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth) || 0;
}
if (value) node.value = v;
return v;
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,20 +0,0 @@
-Copyright (c) 2009 John Resig, http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
@@ -1,39 +0,0 @@
-#!/bin/sh
-# Usage: envjs <platorm> file.js [file2.js ...]
-###########################################################################
-ENVJS_PLATFORM='node'
-
-# first arguments ($1)
-# may be a platform or is a file and the default platorm is used
-if [ -n "$1" ]; then
- if [ -n "$1" ]; then ENVJS_PLATFORM="$1"; shift; fi
-fi
-
-# Run envjs with the given platform
-###########################################################################
-case "$ENVJS_PLATFORM" in
-
- "node")
- node envjs/node.js $@
- ;;
- "rhino")
- java -Xmx512M -jar rhino/js.jar -opt -1 envjs/rhino.js $@
- ;;
- "rhino-debug")
- java -cp rhino/js.jar org.mozilla.javascript.tools.debugger.Main envjs/rhino.js $@
- ;;
- "spyd")
- python envjs/spydermonkey.py envjs/spydermonkey.js $@
- ;;
- "rubyracer")
- ruby -rrubygems envjs/rubyracer.rb envjs/rubyracer.js $@
- ;;
- "johnson")
- ruby -rrubygems envjs/johnson.rb envjs/johnson.js $@
- ;;
- *)
- # platform default means $1 was actually a file
- node envjs/node.js $ENVJS_PLATFORM $@
- ;;
-esac
-
Oops, something went wrong.

0 comments on commit ceb5f7c

Please sign in to comment.