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/05/04 03:56:30 UTC
[incubator-echarts] 01/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 dev
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 1e32bcc50bb0d374fa6c53a770d0c4e3494b2d90
Merge: f7190d1 1c294e6
Author: deqingli <an...@gmail.com>
AuthorDate: Fri May 4 11:23:05 2018 +0800
Merge branch 'master' of https://github.com/apache/incubator-echarts
.rat-excludes | 43 +++++
benchmark/gulpfile.js | 20 +++
benchmark/index.html | 20 +++
build/addHeader.js | 216 ++++++++++++++++++--------
build/apache-rat-0.12.jar | Bin 0 -> 1592593 bytes
build/config.js | 2 +-
build/pre-publish.js | 6 +-
build/preamble.js | 172 +++++++++++++++++++-
build/rat.sh | 24 +++
dist/echarts-en.common.js | 2 +-
dist/echarts-en.common.min.js | 2 +-
dist/echarts-en.js | 4 +-
dist/echarts-en.js.map | 2 +-
dist/echarts-en.min.js | 2 +-
dist/echarts-en.simple.js | 2 +-
dist/echarts-en.simple.min.js | 2 +-
dist/echarts.common.js | 2 +-
dist/echarts.common.min.js | 2 +-
dist/echarts.js | 4 +-
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 2 +-
dist/echarts.simple.js | 2 +-
dist/echarts.simple.min.js | 2 +-
dist/extension/dataTool.js | 20 +++
src/chart/bar/BaseBarSeries.js | 2 +-
src/chart/candlestick/CandlestickSeries.js | 2 +-
test/-cases.html | 22 ++-
test/allZero.html | 20 +++
test/appendData.html | 20 +++
test/area-large.html | 22 ++-
test/area-stack.html | 20 +++
test/area2.html | 20 +++
test/areaLineUpdate.html | 20 +++
test/aria-line-bar.html | 20 +++
test/aria-pie.html | 20 +++
test/axes.html | 20 +++
test/axis-arrow.html | 20 +++
test/axis-boundaryGap.html | 22 ++-
test/axis-containLabel.html | 22 ++-
test/axis-extrema.html | 22 ++-
test/axis-interval.html | 22 ++-
test/axis-interval2.html | 22 ++-
test/axis-lastLabel.html | 20 +++
test/axis-style.html | 20 +++
test/axis.html | 20 +++
test/axisLabel.html | 22 ++-
test/axisPosition.html | 22 ++-
test/bar-label-rotation.html | 20 +++
test/bar-large.html | 20 +++
test/bar-overflow-time-plot.html | 20 +++
test/bar-polar-basic-radial.html | 20 +++
test/bar-polar-basic.html | 20 +++
test/bar-polar-multi-series-radial.html | 20 +++
test/bar-polar-multi-series.html | 20 +++
test/bar-polar-null-data-radial.html | 20 +++
test/bar-polar-null-data.html | 20 +++
test/bar-polar-real-estate.html | 20 +++
test/bar-polar-stack.html | 20 +++
test/bar-stack.html | 22 ++-
test/bar-start.html | 20 +++
test/bar-stream-large.html | 20 +++
test/bar-stream-large1.html | 20 +++
test/bar-t.html | 20 +++
test/bar.html | 20 +++
test/bar2.html | 20 +++
test/bar3.html | 20 +++
test/bmap.html | 20 +++
test/boxplot-multi.html | 20 +++
test/boxplot.html | 20 +++
test/brush.html | 20 +++
test/brush2.html | 20 +++
test/brush3.html | 20 +++
test/calendar-converter.html | 20 +++
test/calendar-effectScater.html | 20 +++
test/calendar-graph.html | 20 +++
test/calendar-heatmap.html | 20 +++
test/calendar-month.html | 20 +++
test/calendar-more.html | 20 +++
test/calendar-orient.html | 20 +++
test/calendar-range.html | 20 +++
test/calendar-scatter.html | 20 +++
test/calendar-simple.html | 20 +++
test/calendar-size.html | 20 +++
test/calendar-split.html | 20 +++
test/calendar-type.html | 20 +++
test/calendar-vertical.html | 20 +++
test/calendar-week.html | 20 +++
test/calendar-year.html | 20 +++
test/calendar.html | 20 +++
test/candlestick-doji.html | 20 +++
test/candlestick-empty.html | 20 +++
test/candlestick-large.html | 20 +++
test/candlestick-large2.html | 20 +++
test/candlestick-large3.html | 20 +++
test/candlestick.html | 20 +++
test/candlestickConnect.html | 20 +++
test/canvas-replay.html | 22 ++-
test/chord.html | 20 +++
test/circle-packing-with-d3.html | 20 +++
test/color-mix-aqi.html | 20 +++
test/connect-dynamic.html | 20 +++
test/connect-manually.html | 20 +++
test/connect.html | 20 +++
test/connect2.html | 20 +++
test/css-transform.html | 22 ++-
test/custom-bmap-grid.html | 20 +++
test/custom-bmap-polygon.html | 20 +++
test/custom-children-remove.html | 22 ++-
test/custom-hexbin.html | 20 +++
test/custom.html | 20 +++
test/dataView.html | 20 +++
test/dataZoom-action.html | 20 +++
test/dataZoom-axes.html | 20 +++
test/dataZoom-axis-type.html | 20 +++
test/dataZoom-cartesian-h.html | 20 +++
test/dataZoom-cartesian-v.html | 20 +++
test/dataZoom-clip.html | 20 +++
test/dataZoom-dataShadow.html | 20 +++
test/dataZoom-dataShadow0.html | 20 +++
test/dataZoom-dataShadow1.html | 20 +++
test/dataZoom-dataShadow2.html | 20 +++
test/dataZoom-dynamic.html | 22 ++-
test/dataZoom-extreme.html | 20 +++
test/dataZoom-geo.html | 22 ++-
test/dataZoom-rainfall-connect.html | 20 +++
test/dataZoom-rainfall-inside.html | 20 +++
test/dataZoom-rainfall.html | 20 +++
test/dataZoom-scatter-category.html | 20 +++
test/dataZoom-scatter-hv-polar.html | 20 +++
test/dataZoom-scatter-hv.html | 20 +++
test/dataZoom-sync.html | 22 ++-
test/dataZoom-toolbox.html | 22 ++-
test/dataZoomHighPrecision.html | 20 +++
test/dataset-category.html | 20 +++
test/dataset-charts.html | 20 +++
test/dataset-layout.html | 20 +++
test/dataset-pivot.html | 20 +++
test/diff.html | 20 +++
test/dynamicData.html | 20 +++
test/dynamicData2.html | 20 +++
test/dynamicData3.html | 22 ++-
test/effectScatter.html | 20 +++
test/encode.html | 20 +++
test/finished-gl.html | 20 +++
test/finished.html | 20 +++
test/force-case.html | 22 ++-
test/force.html | 20 +++
test/force2.html | 20 +++
test/force3.html | 20 +++
test/funnel.html | 20 +++
test/gauge.html | 20 +++
test/geo-data-stream.html | 20 +++
test/geo-lines.html | 20 +++
test/geo-map.html | 20 +++
test/geo-random-stream.html | 20 +++
test/geoLine.html | 20 +++
test/geoScatter.html | 20 +++
test/getOption.html | 20 +++
test/graph-grid-life.html | 20 +++
test/graph-grid.html | 20 +++
test/graph-simple.html | 20 +++
test/graph.html | 20 +++
test/graphicOption.html | 22 ++-
test/graphicRemove.html | 22 ++-
test/gridSimple.html | 20 +++
test/heatmap-large.html | 20 +++
test/heatmap-map.html | 20 +++
test/heatmap.html | 20 +++
test/homepage3.html | 20 +++
test/ie11.html | 22 ++-
test/ie8.html | 20 +++
test/label-position.html | 22 ++-
test/largeLine-tooltip.html | 20 +++
test/largeLine.html | 20 +++
test/largeScatterWithEmpty.html | 22 ++-
test/lazyUpdate.html | 20 +++
test/legend.html | 20 +++
test/lib/caseFrame.css | 20 +++
test/lib/caseFrame.js | 20 +++
test/lib/config.js | 20 +++
test/lib/draggable.js | 20 +++
test/lib/facePrint.js | 20 +++
test/lib/frameInsight.js | 20 +++
test/lib/rearrange.js | 20 +++
test/lib/requireES.js | 20 +++
test/lib/reset.css | 20 +++
test/lib/testHelper.js | 20 +++
test/line-animation.html | 22 ++-
test/line-large.html | 20 +++
test/line-visual.html | 20 +++
test/line.html | 20 +++
test/lines-bus.html | 20 +++
test/lines-flight.html | 20 +++
test/lines-grid.html | 22 ++-
test/lines-ny-appendData.html | 20 +++
test/lines-ny.html | 20 +++
test/lines-remove.html | 20 +++
test/lines-stream-large.html | 20 +++
test/lines-stream-not-large.html | 20 +++
test/lines-symbol.html | 20 +++
test/lines-track.html | 20 +++
test/linesGL-ny-appendData.html | 20 +++
test/loading.html | 20 +++
test/logScale.html | 20 +++
test/map-contour.html | 20 +++
test/map-default.html | 22 ++-
test/map-grid.html | 22 ++-
test/map-labels.html | 22 ++-
test/map-locate.html | 20 +++
test/map-nested.html | 22 ++-
test/map-parallel.html | 22 ++-
test/map-province.html | 20 +++
test/map.html | 20 +++
test/mapWorld.html | 20 +++
test/markArea.html | 20 +++
test/markLine.html | 20 +++
test/markPoint.html | 20 +++
test/masterPainterColorChoice.html | 20 +++
test/media-dataZoom.html | 20 +++
test/media-finance.html | 20 +++
test/media-pie.html | 20 +++
test/min-max-function.html | 20 +++
test/mix.html | 20 +++
test/mobileBench.html | 20 +++
test/multipleGrid.html | 20 +++
test/parallel-aqi.html | 20 +++
test/parallel-lineStyle.html | 20 +++
test/parallel-nutrients.html | 22 ++-
test/pictorial-repeat.html | 22 ++-
test/pictorial-single.html | 22 ++-
test/pictorial-svg.html | 20 +++
test/pie-action.html | 20 +++
test/pie-calculable.html | 20 +++
test/pie-digits.html | 20 +++
test/pie.html | 20 +++
test/pie2.html | 20 +++
test/pie3.html | 20 +++
test/pieDynamic.html | 20 +++
test/polarLine.html | 20 +++
test/polarLine2.html | 20 +++
test/polarScatter.html | 20 +++
test/punchCard.html | 20 +++
test/radar.html | 20 +++
test/radar2.html | 20 +++
test/radar3.html | 20 +++
test/radar4.html | 20 +++
test/richText.html | 22 ++-
test/roseExtreme.html | 22 ++-
test/roseType.html | 20 +++
test/sankey-jump.html | 20 +++
test/sankey-test.html | 20 +++
test/sankey.html | 20 +++
test/scale-integer.html | 20 +++
test/scatter-gps.html | 20 +++
test/scatter-markline.html | 20 +++
test/scatter-random-stream-fix-axis.html | 20 +++
test/scatter-random-stream.html | 20 +++
test/scatter-single-axis.html | 20 +++
test/scatter-stream-large.html | 20 +++
test/scatter-stream-not-large.html | 20 +++
test/scatter-stream-visual.html | 20 +++
test/scatter-weibo.html | 20 +++
test/scatter.html | 20 +++
test/scatterMatrix.html | 22 ++-
test/selectedMode.html | 20 +++
test/showTip.html | 20 +++
test/singleAxisScales.html | 20 +++
test/smooth.html | 20 +++
test/stream-filter.html | 20 +++
test/sunburst-book.html | 20 +++
test/sunburst-canvas.html | 20 +++
test/sunburst-drink.html | 20 +++
test/sunburst-highlight.html | 20 +++
test/sunburst-simple.html | 20 +++
test/sunburst-visualMap.html | 20 +++
test/sunburst.html | 20 +++
test/svg-test.html | 20 +++
test/symbol.html | 20 +++
test/theme.html | 20 +++
test/themeRiver.html | 20 +++
test/themeRiver2.html | 20 +++
test/timeScale.html | 20 +++
test/timeScale2.html | 20 +++
test/timeZone.html | 20 +++
test/timeline-dynamic-series.html | 20 +++
test/timeline-finance.html | 20 +++
test/timeline-layout.html | 20 +++
test/tmp-base.html | 20 +++
test/tooltip-action.html | 20 +++
test/tooltip-axisPointer.html | 20 +++
test/tooltip-cascade.html | 20 +++
test/tooltip-link.html | 22 ++-
test/tooltip-setOption.html | 20 +++
test/tooltip-touch.html | 20 +++
test/tooltip.html | 20 +++
test/touch-candlestick.html | 22 ++-
test/touch-slide.html | 20 +++
test/touch-test.html | 22 ++-
test/tree-addNode.html | 20 +++
test/tree-basic.html | 20 +++
test/tree-image.html | 20 +++
test/tree-legend.html | 20 +++
test/tree-orient-right-left.html | 20 +++
test/tree-orient-top-bottom.html | 20 +++
test/tree-radial.html | 20 +++
test/tree-recurrentRemoveNode.html | 20 +++
test/tree-removeNode.html | 20 +++
test/tree-vertical.html | 20 +++
test/treemap-disk.html | 20 +++
test/treemap-disk2.html | 20 +++
test/treemap-obama.html | 20 +++
test/treemap-option.html | 20 +++
test/treemap-option2.html | 20 +++
test/treemap-simple.html | 20 +++
test/treemap-visual.html | 22 ++-
test/ut/spec/api/containPixel.js | 20 +++
test/ut/spec/api/converter.js | 20 +++
test/ut/spec/api/getVisual.js | 20 +++
test/ut/spec/component/dataZoom/helper.js | 20 +++
test/ut/spec/component/graphic/setOption.js | 20 +++
test/ut/spec/component/helper/sliderMove.js | 20 +++
test/ut/spec/component/visualMap/setOption.js | 20 +++
test/ut/spec/data/List.js | 20 +++
test/ut/spec/data/completeDimensions.js | 20 +++
test/ut/spec/model/Component.js | 20 +++
test/ut/spec/model/Global.js | 20 +++
test/ut/spec/model/timelineOptions.js | 20 +++
test/ut/spec/scale/interval.js | 20 +++
test/ut/spec/ui/axis.boundaryGap.js | 20 +++
test/ut/spec/ui/config.js | 20 +++
test/ut/spec/ui/legend.js | 20 +++
test/ut/spec/ui/series.bar.js | 20 +++
test/ut/spec/ui/title.js | 20 +++
test/ut/spec/ui/title.subtextStyle.js | 20 +++
test/ut/spec/ui/title.textStyle.js | 20 +++
test/ut/spec/util/graphic.js | 20 +++
test/ut/spec/util/layout.js | 20 +++
test/ut/spec/util/model.js | 20 +++
test/ut/spec/util/number.js | 20 +++
test/ut/ui.html | 20 +++
test/ut/ut.html | 20 +++
test/visualMap-categories.html | 20 +++
test/visualMap-continuous.html | 20 +++
test/visualMap-large.html | 22 ++-
test/visualMap-layout.html | 20 +++
test/visualMap-opacity.html | 20 +++
test/visualMap-performance1.html | 20 +++
test/visualMap-pieces.html | 22 ++-
test/visualMap-scatter-colorAndSymbol.html | 20 +++
test/visualMap-scatter-symbolSize.html | 20 +++
test/visualMap-special-case.html | 22 ++-
test/webkit-dep.html | 20 +++
test/worldPopulationBubble.html | 20 +++
353 files changed, 7058 insertions(+), 129 deletions(-)
--
To stop receiving notification emails like this one, please contact
deqingli@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org