You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2018/06/13 10:04:01 UTC
[incubator-echarts] 05/05: Merge branch 'master' of
github.com:ecomfe/echarts
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 46c4c3f2af10c71aa136ca81981c57fb6b5d48b8
Merge: c7d7d19 6d89822
Author: Ovilia <zw...@gmail.com>
AuthorDate: Wed Jun 13 17:25:40 2018 +0800
Merge branch 'master' of github.com:ecomfe/echarts
.rat-excludes => .headerignore | 11 +-
LICENSE | 36 +-
README.md | 7 +
build/addHeader.js | 12 +-
build/preamble.js | 3 +-
build/rat/apache-rat-0.12.jar | Bin 1592593 -> 0 bytes
build/rat/build-run-rat.sh | 25 -
build/rat/javassist.jar | Bin 759215 -> 0 bytes
build/rat/rat.sh | 63 ---
build/rat/runrat.jar | Bin 2561 -> 0 bytes
build/rat/src/MANIFEST.txt | 2 -
build/rat/src/RunRat.class | Bin 3914 -> 0 bytes
build/rat/src/RunRat.java | 184 --------
build/rat/src/report.xsl | 88 ----
extension-src/dataTool/prepareBoxplotData.js | 7 +-
extension-src/dataTool/quantile.js | 60 ---
src/chart/custom.js | 63 ++-
src/chart/graph/GraphView.js | 20 +-
src/chart/graph/graphAction.js | 26 +-
.../focusNodeAdjacencyAction.js} | 33 +-
src/chart/sankey/SankeySeries.js | 2 +
src/chart/sankey/SankeyView.js | 162 ++++++-
src/chart/sankey/sankeyAction.js | 6 +
src/chart/themeRiver/themeRiverVisual.js | 2 +-
src/chart/tree.js | 2 +-
src/chart/tree/TreeSeries.js | 20 +-
src/chart/tree/TreeView.js | 127 ++++-
src/chart/tree/layoutHelper.js | 2 +-
src/chart/tree/treeAction.js | 19 +
src/chart/treemap/TreemapView.js | 13 +-
src/component/axisPointer/IAxisPointer | 20 +
src/component/dataZoom/InsideZoomModel.js | 1 +
src/component/dataZoom/InsideZoomView.js | 92 ++--
src/component/dataZoom/roams.js | 87 ++--
src/component/helper/MapDraw.js | 103 +++--
src/component/helper/RoamController.js | 91 +++-
src/component/tooltip/TooltipContent.js | 7 +
src/coord/ICoordinateSystem | 19 +
src/coord/axisHelper.js | 3 +
src/coord/geo/Geo.js | 126 ++---
src/coord/geo/GeoModel.js | 5 +-
src/coord/geo/Region.js | 10 +-
src/coord/geo/fix/diaoyuIsland.js | 16 +-
src/coord/geo/fix/geoCoord.js | 8 +-
src/coord/geo/fix/nanhai.js | 6 +-
src/coord/geo/fix/textCoord.js | 8 +-
src/coord/geo/geoCreator.js | 80 ++--
src/coord/geo/geoJSONLoader.js | 94 ++++
src/coord/geo/geoSVGLoader.js | 143 ++++++
src/coord/geo/geoSourceManager.js | 126 +++++
src/coord/geo/mapDataStorage.js | 104 +++++
src/coord/geo/prepareCustom.js | 3 +-
src/echarts.js | 38 +-
src/scale/Time.js | 4 +-
src/util/number.js | 44 ++
src/view/Chart.js | 1 +
test/axis-interval.html | 71 +++
test/axisLabel.html | 71 ++-
test/dataZoom-scroll.html | 145 ++++++
test/geoScatter.html | 11 +-
test/sankey-test.html | 314 +++++++------
test/sankey.html | 1 +
test/tooltip-event.html | 151 ++++++
test/touch-slide.html | 509 +++++++++++++++++++++
test/tree-image.html | 2 +-
test/{sankey.html => tree-roam.html} | 59 ++-
66 files changed, 2495 insertions(+), 1073 deletions(-)
--
To stop receiving notification emails like this one, please contact
ovilia@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org