Skip to content

Commit 205070d

Browse files
100pah100pah
committed
release 3.6.1
1 parent e1e76ae commit 205070d

File tree

6 files changed

+64
-85
lines changed

6 files changed

+64
-85
lines changed

‎dist/echarts.common.js

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,9 +1601,9 @@ return /******/ (function(modules) { // webpackBootstrap
16011601
/**
16021602
* @type {number}
16031603
*/
1604-
version: '3.6.0',
1604+
version: '3.6.1',
16051605
dependencies: {
1606-
zrender: '3.5.0'
1606+
zrender: '3.5.1'
16071607
}
16081608
};
16091609

@@ -18004,7 +18004,7 @@ return /******/ (function(modules) { // webpackBootstrap
1800418004
/**
1800518005
* @type {string}
1800618006
*/
18007-
zrender.version = '3.5.0';
18007+
zrender.version = '3.5.1';
1800818008

1800918009
/**
1801018010
* Initializing a zrender instance
@@ -20179,13 +20179,15 @@ return /******/ (function(modules) { // webpackBootstrap
2017920179

2018020180

2018120181
module.exports = (typeof window !== 'undefined' &&
20182-
(window.requestAnimationFrame
20183-
|| window.msRequestAnimationFrame
20184-
|| window.mozRequestAnimationFrame
20185-
|| window.webkitRequestAnimationFrame))
20186-
|| function (func) {
20187-
setTimeout(func, 16);
20188-
};
20182+
((window.requestAnimationFrame && window.requestAnimationFrame.bind(window))
20183+
// https://github.com/ecomfe/zrender/issues/189#issuecomment-224919809
20184+
|| (window.msRequestAnimationFrame && window.msRequestAnimationFrame.bind(window))
20185+
|| window.mozRequestAnimationFrame
20186+
|| window.webkitRequestAnimationFrame)
20187+
)
20188+
|| function (func) {
20189+
setTimeout(func, 16);
20190+
};
2018920191

2019020192

2019120193

@@ -24559,11 +24561,6 @@ return /******/ (function(modules) { // webpackBootstrap
2455924561
* Get interval
2456024562
*/
2456124563
getInterval: function () {
24562-
if (true) {
24563-
if (this._interval == null) {
24564-
throw new Error('`nice` should be called firstly' );
24565-
}
24566-
}
2456724564
return this._interval;
2456824565
},
2456924566

@@ -24581,11 +24578,6 @@ return /******/ (function(modules) { // webpackBootstrap
2458124578
* @return {Array.<number>}
2458224579
*/
2458324580
getTicks: function () {
24584-
if (true) {
24585-
if (this._interval == null) {
24586-
throw new Error('`nice` should be called firstly' );
24587-
}
24588-
}
2458924581
return helper.intervalScaleGetTicks(
2459024582
this._interval, this._extent, this._niceExtent, this._intervalPrecision
2459124583
);
@@ -28446,7 +28438,7 @@ return /******/ (function(modules) { // webpackBootstrap
2844628438
* @param {module:echarts/coord/cartesian/GridModel} gridModel
2844728439
* @param {module:echarts/ExtensionAPI} api
2844828440
*/
28449-
gridProto.resize = function (gridModel, api) {
28441+
gridProto.resize = function (gridModel, api, ignoreContainLabel) {
2845028442

2845128443
var gridRect = layout.getLayoutRect(
2845228444
gridModel.getBoxLayoutParams(), {
@@ -28461,7 +28453,7 @@ return /******/ (function(modules) { // webpackBootstrap
2846128453
adjustAxes();
2846228454

2846328455
// Minus label size
28464-
if (gridModel.get('containLabel')) {
28456+
if (!ignoreContainLabel && gridModel.get('containLabel')) {
2846528457
each(axesList, function (axis) {
2846628458
if (!axis.model.get('axisLabel.inside')) {
2846728459
var labelUnionRect = getLabelUnionRect(axis);
@@ -28862,8 +28854,9 @@ return /******/ (function(modules) { // webpackBootstrap
2886228854
ecModel.eachComponent('grid', function (gridModel, idx) {
2886328855
var grid = new Grid(gridModel, ecModel, api);
2886428856
grid.name = 'grid_' + idx;
28865-
// Postpone `resize` to `update`.
28866-
// grid.resize(gridModel, api);
28857+
// dataSampling requires axis extent, so resize
28858+
// should be performed in create stage.
28859+
grid.resize(gridModel, api, true);
2886728860

2886828861
gridModel.coordinateSystem = grid;
2886928862

‎dist/echarts.common.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/echarts.js

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,9 +1631,9 @@ return /******/ (function(modules) { // webpackBootstrap
16311631
/**
16321632
* @type {number}
16331633
*/
1634-
version: '3.6.0',
1634+
version: '3.6.1',
16351635
dependencies: {
1636-
zrender: '3.5.0'
1636+
zrender: '3.5.1'
16371637
}
16381638
};
16391639

@@ -18034,7 +18034,7 @@ return /******/ (function(modules) { // webpackBootstrap
1803418034
/**
1803518035
* @type {string}
1803618036
*/
18037-
zrender.version = '3.5.0';
18037+
zrender.version = '3.5.1';
1803818038

1803918039
/**
1804018040
* Initializing a zrender instance
@@ -20209,13 +20209,15 @@ return /******/ (function(modules) { // webpackBootstrap
2020920209

2021020210

2021120211
module.exports = (typeof window !== 'undefined' &&
20212-
(window.requestAnimationFrame
20213-
|| window.msRequestAnimationFrame
20214-
|| window.mozRequestAnimationFrame
20215-
|| window.webkitRequestAnimationFrame))
20216-
|| function (func) {
20217-
setTimeout(func, 16);
20218-
};
20212+
((window.requestAnimationFrame && window.requestAnimationFrame.bind(window))
20213+
// https://github.com/ecomfe/zrender/issues/189#issuecomment-224919809
20214+
|| (window.msRequestAnimationFrame && window.msRequestAnimationFrame.bind(window))
20215+
|| window.mozRequestAnimationFrame
20216+
|| window.webkitRequestAnimationFrame)
20217+
)
20218+
|| function (func) {
20219+
setTimeout(func, 16);
20220+
};
2021920221

2022020222

2022120223

@@ -24589,11 +24591,6 @@ return /******/ (function(modules) { // webpackBootstrap
2458924591
* Get interval
2459024592
*/
2459124593
getInterval: function () {
24592-
if (true) {
24593-
if (this._interval == null) {
24594-
throw new Error('`nice` should be called firstly' );
24595-
}
24596-
}
2459724594
return this._interval;
2459824595
},
2459924596

@@ -24611,11 +24608,6 @@ return /******/ (function(modules) { // webpackBootstrap
2461124608
* @return {Array.<number>}
2461224609
*/
2461324610
getTicks: function () {
24614-
if (true) {
24615-
if (this._interval == null) {
24616-
throw new Error('`nice` should be called firstly' );
24617-
}
24618-
}
2461924611
return helper.intervalScaleGetTicks(
2462024612
this._interval, this._extent, this._niceExtent, this._intervalPrecision
2462124613
);
@@ -28476,7 +28468,7 @@ return /******/ (function(modules) { // webpackBootstrap
2847628468
* @param {module:echarts/coord/cartesian/GridModel} gridModel
2847728469
* @param {module:echarts/ExtensionAPI} api
2847828470
*/
28479-
gridProto.resize = function (gridModel, api) {
28471+
gridProto.resize = function (gridModel, api, ignoreContainLabel) {
2848028472

2848128473
var gridRect = layout.getLayoutRect(
2848228474
gridModel.getBoxLayoutParams(), {
@@ -28491,7 +28483,7 @@ return /******/ (function(modules) { // webpackBootstrap
2849128483
adjustAxes();
2849228484

2849328485
// Minus label size
28494-
if (gridModel.get('containLabel')) {
28486+
if (!ignoreContainLabel && gridModel.get('containLabel')) {
2849528487
each(axesList, function (axis) {
2849628488
if (!axis.model.get('axisLabel.inside')) {
2849728489
var labelUnionRect = getLabelUnionRect(axis);
@@ -28892,8 +28884,9 @@ return /******/ (function(modules) { // webpackBootstrap
2889228884
ecModel.eachComponent('grid', function (gridModel, idx) {
2889328885
var grid = new Grid(gridModel, ecModel, api);
2889428886
grid.name = 'grid_' + idx;
28895-
// Postpone `resize` to `update`.
28896-
// grid.resize(gridModel, api);
28887+
// dataSampling requires axis extent, so resize
28888+
// should be performed in create stage.
28889+
grid.resize(gridModel, api, true);
2889728890

2889828891
gridModel.coordinateSystem = grid;
2889928892

‎dist/echarts.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/echarts.simple.js

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,9 +1586,9 @@ return /******/ (function(modules) { // webpackBootstrap
15861586
/**
15871587
* @type {number}
15881588
*/
1589-
version: '3.6.0',
1589+
version: '3.6.1',
15901590
dependencies: {
1591-
zrender: '3.5.0'
1591+
zrender: '3.5.1'
15921592
}
15931593
};
15941594

@@ -17989,7 +17989,7 @@ return /******/ (function(modules) { // webpackBootstrap
1798917989
/**
1799017990
* @type {string}
1799117991
*/
17992-
zrender.version = '3.5.0';
17992+
zrender.version = '3.5.1';
1799317993

1799417994
/**
1799517995
* Initializing a zrender instance
@@ -20164,13 +20164,15 @@ return /******/ (function(modules) { // webpackBootstrap
2016420164

2016520165

2016620166
module.exports = (typeof window !== 'undefined' &&
20167-
(window.requestAnimationFrame
20168-
|| window.msRequestAnimationFrame
20169-
|| window.mozRequestAnimationFrame
20170-
|| window.webkitRequestAnimationFrame))
20171-
|| function (func) {
20172-
setTimeout(func, 16);
20173-
};
20167+
((window.requestAnimationFrame && window.requestAnimationFrame.bind(window))
20168+
// https://github.com/ecomfe/zrender/issues/189#issuecomment-224919809
20169+
|| (window.msRequestAnimationFrame && window.msRequestAnimationFrame.bind(window))
20170+
|| window.mozRequestAnimationFrame
20171+
|| window.webkitRequestAnimationFrame)
20172+
)
20173+
|| function (func) {
20174+
setTimeout(func, 16);
20175+
};
2017420176

2017520177

2017620178

@@ -24544,11 +24546,6 @@ return /******/ (function(modules) { // webpackBootstrap
2454424546
* Get interval
2454524547
*/
2454624548
getInterval: function () {
24547-
if (true) {
24548-
if (this._interval == null) {
24549-
throw new Error('`nice` should be called firstly' );
24550-
}
24551-
}
2455224549
return this._interval;
2455324550
},
2455424551

@@ -24566,11 +24563,6 @@ return /******/ (function(modules) { // webpackBootstrap
2456624563
* @return {Array.<number>}
2456724564
*/
2456824565
getTicks: function () {
24569-
if (true) {
24570-
if (this._interval == null) {
24571-
throw new Error('`nice` should be called firstly' );
24572-
}
24573-
}
2457424566
return helper.intervalScaleGetTicks(
2457524567
this._interval, this._extent, this._niceExtent, this._intervalPrecision
2457624568
);
@@ -28431,7 +28423,7 @@ return /******/ (function(modules) { // webpackBootstrap
2843128423
* @param {module:echarts/coord/cartesian/GridModel} gridModel
2843228424
* @param {module:echarts/ExtensionAPI} api
2843328425
*/
28434-
gridProto.resize = function (gridModel, api) {
28426+
gridProto.resize = function (gridModel, api, ignoreContainLabel) {
2843528427

2843628428
var gridRect = layout.getLayoutRect(
2843728429
gridModel.getBoxLayoutParams(), {
@@ -28446,7 +28438,7 @@ return /******/ (function(modules) { // webpackBootstrap
2844628438
adjustAxes();
2844728439

2844828440
// Minus label size
28449-
if (gridModel.get('containLabel')) {
28441+
if (!ignoreContainLabel && gridModel.get('containLabel')) {
2845028442
each(axesList, function (axis) {
2845128443
if (!axis.model.get('axisLabel.inside')) {
2845228444
var labelUnionRect = getLabelUnionRect(axis);
@@ -28847,8 +28839,9 @@ return /******/ (function(modules) { // webpackBootstrap
2884728839
ecModel.eachComponent('grid', function (gridModel, idx) {
2884828840
var grid = new Grid(gridModel, ecModel, api);
2884928841
grid.name = 'grid_' + idx;
28850-
// Postpone `resize` to `update`.
28851-
// grid.resize(gridModel, api);
28842+
// dataSampling requires axis extent, so resize
28843+
// should be performed in create stage.
28844+
grid.resize(gridModel, api, true);
2885228845

2885328846
gridModel.coordinateSystem = grid;
2885428847

‎dist/echarts.simple.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)