You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by de...@apache.org on 2018/06/19 02:03:53 UTC
[incubator-echarts] 02/02: Merge branch 'master' of
https://github.com/apache/incubator-echarts
This is an automated email from the ASF dual-hosted git repository.
deqingli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit b8352a5b6d5bdcf4fc5f7f557126dc1f07f025ec
Merge: 87217e7 82b04c2
Author: deqingli <an...@gmail.com>
AuthorDate: Tue Jun 19 09:55:25 2018 +0800
Merge branch 'master' of https://github.com/apache/incubator-echarts
.rat-excludes => .headerignore | 11 +-
LICENSE | 36 +--
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 | 89 ++++--
src/chart/graph/GraphView.js | 18 +-
src/chart/helper/Symbol.js | 50 ++--
src/chart/helper/treeHelper.js | 5 +
src/chart/tree.js | 2 +-
src/chart/tree/TreeSeries.js | 19 +-
src/chart/tree/TreeView.js | 126 +++++++-
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 | 26 ++
src/component/tooltip/TooltipModel.js | 5 +
src/component/tooltip/TooltipRichContent.js | 138 +++++++++
src/component/tooltip/TooltipView.js | 107 ++++---
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/export.js | 38 ++-
src/model/Series.js | 36 ++-
src/scale/Time.js | 4 +-
src/util/format.js | 10 +-
src/util/graphic.js | 373 +++++++++++++----------
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/hoverStyle.html | 429 +++++++++++++++++++++++++++
test/tooltip-event.html | 151 ++++++++++
test/tooltip-rich.html | 89 ++++++
test/tree-image.html | 2 +-
test/tree-roam.html | 90 ++++++
66 files changed, 2782 insertions(+), 1065 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org