This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch fix/merge-release-to-master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 5db581db2df4cdf476a5e79607619b482bfd0f46
Merge: 7041103 bf36066
Author: sushuang <sushuang0...@gmail.com>
AuthorDate: Tue Sep 17 01:24:28 2019 +0800
Merge branch 'release' into fix/merge-release-to-master
# Conflicts:
# package-lock.json
# test/hoverStyle.html
# test/tree-basic.html
CONTRIBUTING.md | 27 +
dist/echarts-en.common.js | 2512 ++-
dist/echarts-en.common.min.js | 2 +-
dist/echarts-en.js | 32778 ++++++++++++++--------------
dist/echarts-en.js.map | 2 +-
dist/echarts-en.min.js | 2 +-
dist/echarts-en.simple.js | 1542 +-
dist/echarts-en.simple.min.js | 2 +-
dist/echarts.common.js | 2480 ++-
dist/echarts.common.min.js | 2 +-
dist/echarts.js | 32758 +++++++++++++--------------
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 2 +-
dist/echarts.simple.js | 1510 +-
dist/echarts.simple.min.js | 2 +-
dist/extension/bmap.min.js | 2 +-
dist/extension/dataTool.js | 15 +-
dist/extension/dataTool.js.map | 2 +-
dist/extension/dataTool.min.js | 2 +-
extension-src/dataTool/gexf.js | 8 +-
extension/dataTool/gexf.js | 9 +-
index.js | 42 +-
package-lock.json | 8 +-
package.json | 4 +-
src/chart/bar/BarView.js | 63 +-
src/chart/chord/chordCircularLayout.js | 5 -
src/chart/heatmap/HeatmapLayer.js | 8 -
src/chart/sankey/SankeySeries.js | 5 -
src/chart/sankey/SankeyView.js | 5 -
src/chart/sankey/sankeyAction.js | 5 -
src/chart/sankey/sankeyLayout.js | 5 -
src/chart/sankey/sankeyVisual.js | 5 -
src/chart/themeRiver/ThemeRiverSeries.js | 5 -
src/chart/themeRiver/ThemeRiverView.js | 5 -
src/chart/themeRiver/themeRiverLayout.js | 5 -
src/chart/themeRiver/themeRiverVisual.js | 5 -
src/chart/tree/TreeSeries.js | 5 -
src/chart/tree/TreeView.js | 5 -
src/chart/tree/treeAction.js | 5 -
src/component/brush/selector.js | 45 +-
src/component/calendar.js | 5 -
src/component/toolbox/feature/DataView.js | 19 -
src/component/tooltip/TooltipContent.js | 2 +
src/coord/geo/geoSourceManager.js | 2 +-
src/data/Graph.js | 7 -
src/echarts.js | 4 +-
src/helper.js | 1 -
src/layout/barGrid.js | 14 +-
src/util/KDTree.js | 7 -
src/util/graphic.js | 176 +-
src/util/quickSelect.js | 3 -
src/util/symbol.js | 17 +-
test/bar-large.html | 190 +-
test/bmap.html | 2 +-
test/custom-bmap-grid.html | 2 +-
test/custom-bmap-polygon.html | 2 +-
test/hoverStyle.html | 57 +
test/lines-bus.html | 2 +-
test/lines-remove.html | 2 +-
test/lines-symbol.html | 2 +-
test/lines-track.html | 2 +-
test/ut/spec/util/graphic.js | 22 +-
62 files changed, 39612 insertions(+), 34824 deletions(-)
diff --cc package.json
index 3b180de,9658efc..2dbadba
--- a/package.json
+++ b/package.json
@@@ -13,18 -13,11 +13,18 @@@
"url": "https://github.com/apache/incubator-echarts.git";
},
"scripts": {
+ "release": "node build/build.js --release",
+ "build": "node build/build.js",
+ "watch": "node build/build.js -w",
+ "help": "node build/build.js --help",
"prepublish": "node build/build.js --prepublish",
- "test": "node build/build.js"
+ "test:visual": "node test/runTest/server.js",
+ "test": "node build/build.js",
+ "lint": "./node_modules/.bin/eslint src extension-src",
+ "lint:dist": "echo 'It might take a while. Please wait ...' &&
./node_modules/.bin/jshint --config .jshintrc-dist dist/echarts.js"
},
"dependencies": {
- "zrender": "4.0.7"
+ "zrender": "4.1.0"
},
"devDependencies": {
"@babel/core": "7.3.4",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
