Skip to content

Commit

Permalink
Merge pull request #13654 from apache/release-next
Browse files Browse the repository at this point in the history 
release: 5.0.0-rc.3
  • Loading branch information
@100pah
100pah authored Nov 20, 2020
2 parents 3d6e3ea + a0c485c commit de46c55
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 51 deletions.
28 changes: 18 additions & 10 deletions dist/echarts.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
}

if (typeof console !== 'undefined') {
console.error.apply(args);
console.error.apply(console, args);
}
}

Expand Down Expand Up @@ -3698,7 +3698,7 @@
this._target = target;
this._loop = loop;

if (loop) {
if (loop && additiveTo) {
logError('Can\' use additive animation on looped animation.');
return;
}
Expand Down Expand Up @@ -14046,7 +14046,7 @@
ZRender.prototype.refreshHoverImmediately = function () {
this._needsRefreshHover = false;

if (this.painter.refreshHover) {
if (this.painter.refreshHover && this.painter.getType() === 'canvas') {
this.painter.refreshHover();
}
};
Expand Down Expand Up @@ -14150,7 +14150,7 @@
painterCtors[name] = Ctor;
}

var version = '5.0.0';
var version = '5.0.1';
var zrender = /*#__PURE__*/Object.freeze({
__proto__: null,
init: init,
Expand Down Expand Up @@ -17371,7 +17371,7 @@
var fullDayFormatter = '{yyyy}-{MM}-{dd}';
var fullLeveledFormatter = {
year: '{yyyy}',
month: '{yyyy}:{MM}',
month: '{yyyy}-{MM}',
day: fullDayFormatter,
hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,
Expand Down Expand Up @@ -26925,7 +26925,7 @@

var wmUniqueIndex = Math.round(Math.random() * 9);

var WeakMap$1 = function () {
var WeakMap = function () {
function WeakMap() {
this._id = '__ec_inner_' + wmUniqueIndex++;
}
Expand Down Expand Up @@ -27224,7 +27224,7 @@
return symbolPath;
}

var decalMap = new WeakMap$1();
var decalMap = new WeakMap();
var decalCache = new LRU(100);
var decalKeys = ['symbol', 'symbolSize', 'symbolKeepAspect', 'color', 'backgroundColor', 'dashArrayX', 'dashArrayY', 'dashLineOffset', 'maxTileWidth', 'maxTileHeight'];

Expand Down Expand Up @@ -27607,7 +27607,7 @@
var isObject$2 = isObject;
var version$1 = '5.0.0';
var dependencies = {
zrender: '5.0.0'
zrender: '5.0.1'
};
var TEST_FRAME_REMAIN_TIME = 1;
var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
Expand Down Expand Up @@ -52930,6 +52930,10 @@
return value.type === 'radial';
}

function isGradient(value) {
return value && (value.type === 'linear' || value.type === 'radial');
}

var GradientManager = function (_super) {
__extends(GradientManager, _super);

Expand All @@ -52943,7 +52947,7 @@
each(['fill', 'stroke'], function (fillOrStroke) {
var value = displayable.style[fillOrStroke];

if (value && (value.type === 'linear' || value.type === 'radial')) {
if (isGradient(value)) {
var gradient = value;
var defs = that_1.getDefs(true);
var dom = void 0;
Expand Down Expand Up @@ -52986,6 +52990,10 @@
};

GradientManager.prototype.update = function (gradient) {
if (!isGradient(gradient)) {
return;
}

var that = this;
this.doUpdate(gradient, function () {
var dom = gradient.__dom;
Expand Down Expand Up @@ -53211,7 +53219,7 @@
}

if (isPattern(displayable.style.stroke)) {
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.fill));
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.stroke));
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion dist/echarts.common.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.common.min.js
View file

Large diffs are not rendered by default.

30 changes: 19 additions & 11 deletions dist/echarts.esm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function logError() {
}

if (typeof console !== 'undefined') {
console.error.apply(args);
console.error.apply(console, args);
}
}

Expand Down Expand Up @@ -3695,7 +3695,7 @@ var Animator = function () {
this._target = target;
this._loop = loop;

if (loop) {
if (loop && additiveTo) {
logError('Can\' use additive animation on looped animation.');
return;
}
Expand Down Expand Up @@ -15430,7 +15430,7 @@ var ZRender = function () {
ZRender.prototype.refreshHoverImmediately = function () {
this._needsRefreshHover = false;

if (this.painter.refreshHover) {
if (this.painter.refreshHover && this.painter.getType() === 'canvas') {
this.painter.refreshHover();
}
};
Expand Down Expand Up @@ -15534,7 +15534,7 @@ function registerPainter(name, Ctor) {
painterCtors[name] = Ctor;
}

var version = '5.0.0';
var version = '5.0.1';
var zrender = /*#__PURE__*/Object.freeze({
__proto__: null,
init: init,
Expand Down Expand Up @@ -18819,7 +18819,7 @@ var defaultLeveledFormatter = {
var fullDayFormatter = '{yyyy}-{MM}-{dd}';
var fullLeveledFormatter = {
year: '{yyyy}',
month: '{yyyy}:{MM}',
month: '{yyyy}-{MM}',
day: fullDayFormatter,
hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,
Expand Down Expand Up @@ -28492,7 +28492,7 @@ function findEventDispatcher(target, det, returnFirstMatch) {

var wmUniqueIndex = Math.round(Math.random() * 9);

var WeakMap$1 = function () {
var WeakMap = function () {
function WeakMap() {
this._id = '__ec_inner_' + wmUniqueIndex++;
}
Expand Down Expand Up @@ -28791,7 +28791,7 @@ function createSymbol(symbolType, x, y, w, h, color, keepAspect) {
return symbolPath;
}

var decalMap = new WeakMap$1();
var decalMap = new WeakMap();
var decalCache = new LRU(100);
var decalKeys = ['symbol', 'symbolSize', 'symbolKeepAspect', 'color', 'backgroundColor', 'dashArrayX', 'dashArrayY', 'dashLineOffset', 'maxTileWidth', 'maxTileHeight'];

Expand Down Expand Up @@ -29174,7 +29174,7 @@ var isFunction$1 = isFunction;
var isObject$2 = isObject;
var version$1 = '5.0.0';
var dependencies = {
zrender: '5.0.0'
zrender: '5.0.1'
};
var TEST_FRAME_REMAIN_TIME = 1;
var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
Expand Down Expand Up @@ -65915,7 +65915,7 @@ var GeoView = function (_super) {
var current = e.target;
var eventData;

while ((eventData = getECData(current).eventData) == null) {
while (current && (eventData = getECData(current).eventData) == null) {
current = current.__hostTarget || current.parent;
}

Expand Down Expand Up @@ -79410,6 +79410,10 @@ function isRadialGradient(value) {
return value.type === 'radial';
}

function isGradient(value) {
return value && (value.type === 'linear' || value.type === 'radial');
}

var GradientManager = function (_super) {
__extends(GradientManager, _super);

Expand All @@ -79423,7 +79427,7 @@ var GradientManager = function (_super) {
each(['fill', 'stroke'], function (fillOrStroke) {
var value = displayable.style[fillOrStroke];

if (value && (value.type === 'linear' || value.type === 'radial')) {
if (isGradient(value)) {
var gradient = value;
var defs = that_1.getDefs(true);
var dom = void 0;
Expand Down Expand Up @@ -79466,6 +79470,10 @@ var GradientManager = function (_super) {
};

GradientManager.prototype.update = function (gradient) {
if (!isGradient(gradient)) {
return;
}

var that = this;
this.doUpdate(gradient, function () {
var dom = gradient.__dom;
Expand Down Expand Up @@ -79691,7 +79699,7 @@ var PatternManager = function (_super) {
}

if (isPattern(displayable.style.stroke)) {
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.fill));
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.stroke));
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion dist/echarts.esm.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.esm.min.js
View file

Large diffs are not rendered by default.

30 changes: 19 additions & 11 deletions dist/echarts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
}

if (typeof console !== 'undefined') {
console.error.apply(args);
console.error.apply(console, args);
}
}

Expand Down Expand Up @@ -3698,7 +3698,7 @@
this._target = target;
this._loop = loop;

if (loop) {
if (loop && additiveTo) {
logError('Can\' use additive animation on looped animation.');
return;
}
Expand Down Expand Up @@ -15433,7 +15433,7 @@
ZRender.prototype.refreshHoverImmediately = function () {
this._needsRefreshHover = false;

if (this.painter.refreshHover) {
if (this.painter.refreshHover && this.painter.getType() === 'canvas') {
this.painter.refreshHover();
}
};
Expand Down Expand Up @@ -15537,7 +15537,7 @@
painterCtors[name] = Ctor;
}

var version = '5.0.0';
var version = '5.0.1';
var zrender = /*#__PURE__*/Object.freeze({
__proto__: null,
init: init,
Expand Down Expand Up @@ -18822,7 +18822,7 @@
var fullDayFormatter = '{yyyy}-{MM}-{dd}';
var fullLeveledFormatter = {
year: '{yyyy}',
month: '{yyyy}:{MM}',
month: '{yyyy}-{MM}',
day: fullDayFormatter,
hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,
Expand Down Expand Up @@ -28495,7 +28495,7 @@

var wmUniqueIndex = Math.round(Math.random() * 9);

var WeakMap$1 = function () {
var WeakMap = function () {
function WeakMap() {
this._id = '__ec_inner_' + wmUniqueIndex++;
}
Expand Down Expand Up @@ -28794,7 +28794,7 @@
return symbolPath;
}

var decalMap = new WeakMap$1();
var decalMap = new WeakMap();
var decalCache = new LRU(100);
var decalKeys = ['symbol', 'symbolSize', 'symbolKeepAspect', 'color', 'backgroundColor', 'dashArrayX', 'dashArrayY', 'dashLineOffset', 'maxTileWidth', 'maxTileHeight'];

Expand Down Expand Up @@ -29177,7 +29177,7 @@
var isObject$2 = isObject;
var version$1 = '5.0.0';
var dependencies = {
zrender: '5.0.0'
zrender: '5.0.1'
};
var TEST_FRAME_REMAIN_TIME = 1;
var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
Expand Down Expand Up @@ -65918,7 +65918,7 @@
var current = e.target;
var eventData;

while ((eventData = getECData(current).eventData) == null) {
while (current && (eventData = getECData(current).eventData) == null) {
current = current.__hostTarget || current.parent;
}

Expand Down Expand Up @@ -79413,6 +79413,10 @@
return value.type === 'radial';
}

function isGradient(value) {
return value && (value.type === 'linear' || value.type === 'radial');
}

var GradientManager = function (_super) {
__extends(GradientManager, _super);

Expand All @@ -79426,7 +79430,7 @@
each(['fill', 'stroke'], function (fillOrStroke) {
var value = displayable.style[fillOrStroke];

if (value && (value.type === 'linear' || value.type === 'radial')) {
if (isGradient(value)) {
var gradient = value;
var defs = that_1.getDefs(true);
var dom = void 0;
Expand Down Expand Up @@ -79469,6 +79473,10 @@
};

GradientManager.prototype.update = function (gradient) {
if (!isGradient(gradient)) {
return;
}

var that = this;
this.doUpdate(gradient, function () {
var dom = gradient.__dom;
Expand Down Expand Up @@ -79694,7 +79702,7 @@
}

if (isPattern(displayable.style.stroke)) {
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.fill));
_super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.stroke));
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion dist/echarts.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.min.js
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/echarts.simple.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
}

if (typeof console !== 'undefined') {
console.error.apply(args);
console.error.apply(console, args);
}
}

Expand Down Expand Up @@ -3349,7 +3349,7 @@
this._target = target;
this._loop = loop;

if (loop) {
if (loop && additiveTo) {
logError('Can\' use additive animation on looped animation.');
return;
}
Expand Down Expand Up @@ -13614,7 +13614,7 @@
ZRender.prototype.refreshHoverImmediately = function () {
this._needsRefreshHover = false;

if (this.painter.refreshHover) {
if (this.painter.refreshHover && this.painter.getType() === 'canvas') {
this.painter.refreshHover();
}
};
Expand Down Expand Up @@ -16575,7 +16575,7 @@
var fullDayFormatter = '{yyyy}-{MM}-{dd}';
var fullLeveledFormatter = {
year: '{yyyy}',
month: '{yyyy}:{MM}',
month: '{yyyy}-{MM}',
day: fullDayFormatter,
hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,
Expand Down Expand Up @@ -26269,7 +26269,7 @@
var isObject$2 = isObject;
var version = '5.0.0';
var dependencies = {
zrender: '5.0.0'
zrender: '5.0.1'
};
var TEST_FRAME_REMAIN_TIME = 1;
var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
Expand Down
2 changes: 1 addition & 1 deletion dist/echarts.simple.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit de46c55

Please sign in to comment.