This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit b4ce0dbfa1d8646b79bfc5caf86429dd4b59e48f
Merge: 978f709 dbd5a32
Author: sushuang <[email protected]>
AuthorDate: Wed Sep 19 15:28:49 2018 +0800

    Merge branch 'release'

 .eslintrc.yaml                                |   12 +-
 dist/echarts-en.common.js                     | 3953 ++++++++++++----
 dist/echarts-en.common.min.js                 |    2 +-
 dist/echarts-en.js                            | 6284 ++++++++++++++++++-------
 dist/echarts-en.js.map                        |    2 +-
 dist/echarts-en.min.js                        |    2 +-
 dist/echarts-en.simple.js                     | 3040 +++++++++---
 dist/echarts-en.simple.min.js                 |    2 +-
 dist/echarts.common.js                        | 3953 ++++++++++++----
 dist/echarts.common.min.js                    |    2 +-
 dist/echarts.js                               | 6284 ++++++++++++++++++-------
 dist/echarts.js.map                           |    2 +-
 dist/echarts.min.js                           |    2 +-
 dist/echarts.simple.js                        | 3040 +++++++++---
 dist/echarts.simple.min.js                    |    2 +-
 dist/extension/dataTool.js                    |  107 +-
 dist/extension/dataTool.js.map                |    2 +-
 dist/extension/dataTool.min.js                |    2 +-
 extension/dataTool/prepareBoxplotData.js      |    8 +-
 package.json                                  |    6 +-
 src/chart/bar/PictorialBarView.js             |    4 +-
 src/chart/candlestick/candlestickLayout.js    |    2 +
 src/chart/chord/chordCircularLayout.js        |    4 +-
 src/chart/custom.js                           |  148 +-
 src/chart/funnel/FunnelView.js                |    2 +-
 src/chart/funnel/funnelLayout.js              |    3 +-
 src/chart/graph/adjustEdge.js                 |    8 +-
 src/chart/heatmap/HeatmapLayer.js             |    8 +-
 src/chart/helper/LargeSymbolDraw.js           |    2 +
 src/chart/helper/Line.js                      |    2 +-
 src/chart/helper/Symbol.js                    |   19 +-
 src/chart/helper/whiskerBoxCommon.js          |    2 +-
 src/chart/line/LineView.js                    |   12 +-
 src/chart/line/poly.js                        |   16 +-
 src/chart/lines/LinesSeries.js                |    6 +-
 src/chart/lines/linesLayout.js                |    2 +
 src/chart/parallel/ParallelView.js            |    1 -
 src/chart/sankey/SankeySeries.js              |    9 +-
 src/chart/sankey/sankeyLayout.js              |   16 +-
 src/chart/sankey/sankeyVisual.js              |    4 +-
 src/chart/tree/TreeSeries.js                  |    2 +-
 src/chart/treemap/Breadcrumb.js               |    1 +
 src/chart/treemap/treemapLayout.js            |    2 +-
 src/chart/treemap/treemapVisual.js            |    3 +-
 src/component/axis/AngleAxisView.js           |    6 +-
 src/component/axis/AxisBuilder.js             |    3 +-
 src/component/axis/RadiusAxisView.js          |    2 +-
 src/component/axis/SingleAxisView.js          |    4 +-
 src/component/axisPointer/AxisPointerModel.js |    2 +
 src/component/axisPointer/BaseAxisPointer.js  |    6 +-
 src/component/axisPointer/viewHelper.js       |    2 +-
 src/component/brush/BrushModel.js             |    6 +-
 src/component/dataZoom/AxisProxy.js           |    5 +-
 src/component/dataZoom/DataZoomModel.js       |    4 +-
 src/component/dataZoom/InsideZoomView.js      |    5 +-
 src/component/dataZoom/SliderZoomModel.js     |    2 +
 src/component/dataZoom/SliderZoomView.js      |    2 +-
 src/component/dataZoom/roams.js               |    6 +
 src/component/graphic.js                      |   31 +-
 src/component/helper/MapDraw.js               |    1 +
 src/component/helper/RoamController.js        |    8 +-
 src/component/helper/listComponent.js         |    2 +-
 src/component/legend/LegendView.js            |   25 +-
 src/component/marker/MarkAreaView.js          |    6 +-
 src/component/marker/MarkLineView.js          |   24 +-
 src/component/marker/MarkPointView.js         |    2 +-
 src/component/parallel.js                     |    2 +-
 src/component/title.js                        |   12 +-
 src/component/toolbox/ToolboxView.js          |    2 +-
 src/component/toolbox/feature/Brush.js        |    4 +
 src/component/toolbox/feature/DataView.js     |    2 +-
 src/component/toolbox/feature/DataZoom.js     |    4 +-
 src/component/toolbox/feature/MagicType.js    |    4 +-
 src/component/toolbox/feature/Restore.js      |    2 +
 src/component/toolbox/feature/SaveAsImage.js  |   12 +-
 src/component/tooltip/TooltipModel.js         |    2 +-
 src/component/tooltip/TooltipRichContent.js   |    4 +-
 src/component/tooltip/TooltipView.js          |   10 +-
 src/component/visualMap/ContinuousModel.js    |   26 +-
 src/component/visualMap/VisualMapModel.js     |    2 +-
 src/coord/axisDefault.js                      |    2 +-
 src/coord/axisModelCommonMixin.js             |    2 +-
 src/coord/calendar/Calendar.js                |    6 +-
 src/coord/cartesian/cartesianAxisHelper.js    |    4 +-
 src/coord/geo/Geo.js                          |   13 +-
 src/coord/geo/Region.js                       |    2 +-
 src/coord/geo/fix/nanhai.js                   |   28 +-
 src/coord/geo/fix/textCoord.js                |    2 +-
 src/coord/geo/geoCreator.js                   |   26 +-
 src/coord/radar/RadarModel.js                 |    2 +-
 src/coord/single/Single.js                    |    2 +-
 src/coord/single/singleCreator.js             |    2 +-
 src/data/Graph.js                             |    7 +-
 src/data/List.js                              |   16 +-
 src/data/Tree.js                              |    2 +-
 src/data/helper/completeDimensions.js         |   19 +-
 src/data/helper/sourceHelper.js               |    3 +-
 src/echarts.js                                |  230 +-
 src/layout/barGrid.js                         |    2 +
 src/layout/barPolar.js                        |    4 +-
 src/layout/points.js                          |    2 +
 src/model/Model.js                            |    2 +-
 src/model/globalDefault.js                    |    5 +-
 src/model/mixin/dataFormat.js                 |   11 +-
 src/scale/Time.js                             |    2 +-
 src/stream/Scheduler.js                       |    6 +-
 src/theme/dark.js                             |    5 +-
 src/theme/light.js                            |    5 +-
 src/util/format.js                            |    6 +-
 src/util/graphic.js                           |   34 +-
 src/util/number.js                            |   42 +-
 src/util/quickSelect.js                       |    2 +-
 src/visual/symbol.js                          |    4 +-
 src/visual/visualSolution.js                  |    2 +-
 test/axis-interval.html                       |    4 +-
 test/bar.html                                 |    5 +-
 test/custom-feature.html                      |  338 +-
 test/custom.html                              |   26 +-
 test/dataZoom-scroll.html                     |  206 +-
 test/dynamic-splitNumber.html                 |  124 +
 test/ec-event.html                            |  315 +-
 test/encode.html                              |  108 +
 test/finished.html                            |   27 +-
 test/hoverStyle.html                          |   91 +-
 test/largeScatterWithEmpty.html               |   24 +-
 test/legend.html                              |   73 +-
 test/lib/draggable.js                         |    9 +-
 test/lib/reset.css                            |    7 +
 test/lib/testHelper.js                        |    5 +-
 test/tooltip-rich.html                        |    5 +-
 test/tree-roam.html                           |    2 +
 test/treemap-disk.html                        |   17 +-
 theme/dark.js                                 |    7 +-
 133 files changed, 22046 insertions(+), 7076 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to