Skip to content

Commit

Permalink
release 3.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@100pah
100pah committed May 26, 2017
1 parent e1e76ae commit 205070d
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 85 deletions.
41 changes: 17 additions & 24 deletions dist/echarts.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1601,9 +1601,9 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.6.0',
version: '3.6.1',
dependencies: {
zrender: '3.5.0'
zrender: '3.5.1'
}
};

Expand Down Expand Up @@ -18004,7 +18004,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {string}
*/
zrender.version = '3.5.0';
zrender.version = '3.5.1';

/**
* Initializing a zrender instance
Expand Down Expand Up @@ -20179,13 +20179,15 @@ return /******/ (function(modules) { // webpackBootstrap


module.exports = (typeof window !== 'undefined' &&
(window.requestAnimationFrame
|| window.msRequestAnimationFrame
|| window.mozRequestAnimationFrame
|| window.webkitRequestAnimationFrame))
|| function (func) {
setTimeout(func, 16);
};
((window.requestAnimationFrame && window.requestAnimationFrame.bind(window))
// https://github.com/ecomfe/zrender/issues/189#issuecomment-224919809
|| (window.msRequestAnimationFrame && window.msRequestAnimationFrame.bind(window))
|| window.mozRequestAnimationFrame
|| window.webkitRequestAnimationFrame)
)
|| function (func) {
setTimeout(func, 16);
};



Expand Down Expand Up @@ -24559,11 +24561,6 @@ return /******/ (function(modules) { // webpackBootstrap
* Get interval
*/
getInterval: function () {
if (true) {
if (this._interval == null) {
throw new Error('`nice` should be called firstly' );
}
}
return this._interval;
},

Expand All @@ -24581,11 +24578,6 @@ return /******/ (function(modules) { // webpackBootstrap
* @return {Array.<number>}
*/
getTicks: function () {
if (true) {
if (this._interval == null) {
throw new Error('`nice` should be called firstly' );
}
}
return helper.intervalScaleGetTicks(
this._interval, this._extent, this._niceExtent, this._intervalPrecision
);
Expand Down Expand Up @@ -28446,7 +28438,7 @@ return /******/ (function(modules) { // webpackBootstrap
* @param {module:echarts/coord/cartesian/GridModel} gridModel
* @param {module:echarts/ExtensionAPI} api
*/
gridProto.resize = function (gridModel, api) {
gridProto.resize = function (gridModel, api, ignoreContainLabel) {

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

// Minus label size
if (gridModel.get('containLabel')) {
if (!ignoreContainLabel && gridModel.get('containLabel')) {
each(axesList, function (axis) {
if (!axis.model.get('axisLabel.inside')) {
var labelUnionRect = getLabelUnionRect(axis);
Expand Down Expand Up @@ -28862,8 +28854,9 @@ return /******/ (function(modules) { // webpackBootstrap
ecModel.eachComponent('grid', function (gridModel, idx) {
var grid = new Grid(gridModel, ecModel, api);
grid.name = 'grid_' + idx;
// Postpone `resize` to `update`.
// grid.resize(gridModel, api);
// dataSampling requires axis extent, so resize
// should be performed in create stage.
grid.resize(gridModel, api, true);

gridModel.coordinateSystem = grid;

Expand Down
8 changes: 4 additions & 4 deletions dist/echarts.common.min.js
View file

Large diffs are not rendered by default.

41 changes: 17 additions & 24 deletions dist/echarts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1631,9 +1631,9 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.6.0',
version: '3.6.1',
dependencies: {
zrender: '3.5.0'
zrender: '3.5.1'
}
};

Expand Down Expand Up @@ -18034,7 +18034,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {string}
*/
zrender.version = '3.5.0';
zrender.version = '3.5.1';

/**
* Initializing a zrender instance
Expand Down Expand Up @@ -20209,13 +20209,15 @@ return /******/ (function(modules) { // webpackBootstrap


module.exports = (typeof window !== 'undefined' &&
(window.requestAnimationFrame
|| window.msRequestAnimationFrame
|| window.mozRequestAnimationFrame
|| window.webkitRequestAnimationFrame))
|| function (func) {
setTimeout(func, 16);
};
((window.requestAnimationFrame && window.requestAnimationFrame.bind(window))
// https://github.com/ecomfe/zrender/issues/189#issuecomment-224919809
|| (window.msRequestAnimationFrame && window.msRequestAnimationFrame.bind(window))
|| window.mozRequestAnimationFrame
|| window.webkitRequestAnimationFrame)
)
|| function (func) {
setTimeout(func, 16);
};



Expand Down Expand Up @@ -24589,11 +24591,6 @@ return /******/ (function(modules) { // webpackBootstrap
* Get interval
*/
getInterval: function () {
if (true) {
if (this._interval == null) {
throw new Error('`nice` should be called firstly' );
}
}
return this._interval;
},

Expand All @@ -24611,11 +24608,6 @@ return /******/ (function(modules) { // webpackBootstrap
* @return {Array.<number>}
*/
getTicks: function () {
if (true) {
if (this._interval == null) {
throw new Error('`nice` should be called firstly' );
}
}
return helper.intervalScaleGetTicks(
this._interval, this._extent, this._niceExtent, this._intervalPrecision
);
Expand Down Expand Up @@ -28476,7 +28468,7 @@ return /******/ (function(modules) { // webpackBootstrap
* @param {module:echarts/coord/cartesian/GridModel} gridModel
* @param {module:echarts/ExtensionAPI} api
*/
gridProto.resize = function (gridModel, api) {
gridProto.resize = function (gridModel, api, ignoreContainLabel) {

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

// Minus label size
if (gridModel.get('containLabel')) {
if (!ignoreContainLabel && gridModel.get('containLabel')) {
each(axesList, function (axis) {
if (!axis.model.get('axisLabel.inside')) {
var labelUnionRect = getLabelUnionRect(axis);
Expand Down Expand Up @@ -28892,8 +28884,9 @@ return /******/ (function(modules) { // webpackBootstrap
ecModel.eachComponent('grid', function (gridModel, idx) {
var grid = new Grid(gridModel, ecModel, api);
grid.name = 'grid_' + idx;
// Postpone `resize` to `update`.
// grid.resize(gridModel, api);
// dataSampling requires axis extent, so resize
// should be performed in create stage.
grid.resize(gridModel, api, true);

gridModel.coordinateSystem = grid;

Expand Down
10 changes: 5 additions & 5 deletions dist/echarts.min.js
View file

Large diffs are not rendered by default.

41 changes: 17 additions & 24 deletions dist/echarts.simple.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1586,9 +1586,9 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.6.0',
version: '3.6.1',
dependencies: {
zrender: '3.5.0'
zrender: '3.5.1'
}
};

Expand Down Expand Up @@ -17989,7 +17989,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {string}
*/
zrender.version = '3.5.0';
zrender.version = '3.5.1';

/**
* Initializing a zrender instance
Expand Down Expand Up @@ -20164,13 +20164,15 @@ return /******/ (function(modules) { // webpackBootstrap


module.exports = (typeof window !== 'undefined' &&
(window.requestAnimationFrame
|| window.msRequestAnimationFrame
|| window.mozRequestAnimationFrame
|| window.webkitRequestAnimationFrame))
|| function (func) {
setTimeout(func, 16);
};
((window.requestAnimationFrame && window.requestAnimationFrame.bind(window))
// https://github.com/ecomfe/zrender/issues/189#issuecomment-224919809
|| (window.msRequestAnimationFrame && window.msRequestAnimationFrame.bind(window))
|| window.mozRequestAnimationFrame
|| window.webkitRequestAnimationFrame)
)
|| function (func) {
setTimeout(func, 16);
};



Expand Down Expand Up @@ -24544,11 +24546,6 @@ return /******/ (function(modules) { // webpackBootstrap
* Get interval
*/
getInterval: function () {
if (true) {
if (this._interval == null) {
throw new Error('`nice` should be called firstly' );
}
}
return this._interval;
},

Expand All @@ -24566,11 +24563,6 @@ return /******/ (function(modules) { // webpackBootstrap
* @return {Array.<number>}
*/
getTicks: function () {
if (true) {
if (this._interval == null) {
throw new Error('`nice` should be called firstly' );
}
}
return helper.intervalScaleGetTicks(
this._interval, this._extent, this._niceExtent, this._intervalPrecision
);
Expand Down Expand Up @@ -28431,7 +28423,7 @@ return /******/ (function(modules) { // webpackBootstrap
* @param {module:echarts/coord/cartesian/GridModel} gridModel
* @param {module:echarts/ExtensionAPI} api
*/
gridProto.resize = function (gridModel, api) {
gridProto.resize = function (gridModel, api, ignoreContainLabel) {

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

// Minus label size
if (gridModel.get('containLabel')) {
if (!ignoreContainLabel && gridModel.get('containLabel')) {
each(axesList, function (axis) {
if (!axis.model.get('axisLabel.inside')) {
var labelUnionRect = getLabelUnionRect(axis);
Expand Down Expand Up @@ -28847,8 +28839,9 @@ return /******/ (function(modules) { // webpackBootstrap
ecModel.eachComponent('grid', function (gridModel, idx) {
var grid = new Grid(gridModel, ecModel, api);
grid.name = 'grid_' + idx;
// Postpone `resize` to `update`.
// grid.resize(gridModel, api);
// dataSampling requires axis extent, so resize
// should be performed in create stage.
grid.resize(gridModel, api, true);

gridModel.coordinateSystem = grid;

Expand Down
8 changes: 4 additions & 4 deletions dist/echarts.simple.min.js
View file

Large diffs are not rendered by default.

0 comments on commit 205070d

Please sign in to comment.