Skip to content

Commit 108d65d

Browse files
committed
Merge branch '2.9.7'
2 parents fb86373 + 540d3ac commit 108d65d

37 files changed

Lines changed: 10319 additions & 12496 deletions

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
NODE_PATH ?= ./node_modules
44
JS_COMPILER = $(NODE_PATH)/uglify-js/bin/uglifyjs
5+
JS_BEAUTIFIER = $(NODE_PATH)/uglify-js/bin/uglifyjs -b -i 2 -nm -ns
56
JS_TESTER = $(NODE_PATH)/vows/bin/vows
67

78
all: \
@@ -74,6 +75,7 @@ d3.core.js: \
7475
src/core/formatPrefix.js \
7576
src/core/ease.js \
7677
src/core/event.js \
78+
src/core/transform.js \
7779
src/core/interpolate.js \
7880
src/core/uninterpolate.js \
7981
src/core/rgb.js \
@@ -107,6 +109,7 @@ d3.core.js: \
107109
src/core/transition.js \
108110
src/core/transition-select.js \
109111
src/core/transition-selectAll.js \
112+
src/core/transition-filter.js \
110113
src/core/transition-attr.js \
111114
src/core/transition-style.js \
112115
src/core/transition-text.js \
@@ -116,7 +119,6 @@ d3.core.js: \
116119
src/core/transition-each.js \
117120
src/core/transition-transition.js \
118121
src/core/timer.js \
119-
src/core/transform.js \
120122
src/core/mouse.js \
121123
src/core/touches.js \
122124
src/core/noop.js
@@ -225,7 +227,7 @@ test: all
225227

226228
d3%.js: Makefile
227229
@rm -f $@
228-
cat $(filter %.js,$^) > $@
230+
cat $(filter %.js,$^) | $(JS_BEAUTIFIER) > $@
229231
@chmod a-w $@
230232

231233
package.json: src/package.js

0 commit comments

Comments
 (0)