Permalink
Browse files

Merge branch '2.9.7'

  • Loading branch information...
2 parents fb86373 + 540d3ac commit 108d65da0eebd431425bf3aa51f0ed234d04975e @mbostock mbostock committed Jul 31, 2012
View
@@ -2,6 +2,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
all: \
@@ -74,6 +75,7 @@ d3.core.js: \
src/core/formatPrefix.js \
src/core/ease.js \
src/core/event.js \
+ src/core/transform.js \
src/core/interpolate.js \
src/core/uninterpolate.js \
src/core/rgb.js \
@@ -107,6 +109,7 @@ d3.core.js: \
src/core/transition.js \
src/core/transition-select.js \
src/core/transition-selectAll.js \
+ src/core/transition-filter.js \
src/core/transition-attr.js \
src/core/transition-style.js \
src/core/transition-text.js \
@@ -116,7 +119,6 @@ d3.core.js: \
src/core/transition-each.js \
src/core/transition-transition.js \
src/core/timer.js \
- src/core/transform.js \
src/core/mouse.js \
src/core/touches.js \
src/core/noop.js
@@ -225,7 +227,7 @@ test: all
d3%.js: Makefile
@rm -f $@
- cat $(filter %.js,$^) > $@
+ cat $(filter %.js,$^) | $(JS_BEAUTIFIER) > $@
@chmod a-w $@
package.json: src/package.js
Oops, something went wrong.

0 comments on commit 108d65d

Please sign in to comment.