Skip to content

Commit 559d610

Browse files
authored
Merge pull request #922 from ecomfe/release-dev
Release v5.3.2 from release-dev to release
2 parents 3ffb28f + bae3e92 commit 559d610

6 files changed

+21
-15
lines changed

dist/zrender.js

+15-9
Original file line numberDiff line numberDiff line change
@@ -7128,7 +7128,7 @@
71287128
function registerPainter(name, Ctor) {
71297129
painterCtors[name] = Ctor;
71307130
}
7131-
var version = '5.3.0';
7131+
var version = '5.3.2';
71327132

71337133
var STYLE_MAGIC_KEY = '__zr_style_' + Math.round((Math.random() * 10));
71347134
var DEFAULT_COMMON_STYLE = {
@@ -12311,10 +12311,10 @@
1231112311
!isImageReady(image) && cachedImgObj.pending.push(pendingWrap);
1231212312
}
1231312313
else {
12314-
var image_1 = platformApi.loadImage(newImageOrSrc, imageOnLoad, imageOnLoad);
12315-
image_1.__zrImageSrc = newImageOrSrc;
12316-
globalImageCache.put(newImageOrSrc, image_1.__cachedImgObj = {
12317-
image: image_1,
12314+
image = platformApi.loadImage(newImageOrSrc, imageOnLoad, imageOnLoad);
12315+
image.__zrImageSrc = newImageOrSrc;
12316+
globalImageCache.put(newImageOrSrc, image.__cachedImgObj = {
12317+
image: image,
1231812318
pending: [pendingWrap]
1231912319
});
1232012320
}
@@ -13998,6 +13998,9 @@
1399813998
});
1399913999
}
1400014000

14001+
function isSafeNum(num) {
14002+
return isFinite(num);
14003+
}
1400114004
function createLinearGradient(ctx, obj, rect) {
1400214005
var x = obj.x == null ? 0 : obj.x;
1400314006
var x2 = obj.x2 == null ? 1 : obj.x2;
@@ -14009,10 +14012,10 @@
1400914012
y = y * rect.height + rect.y;
1401014013
y2 = y2 * rect.height + rect.y;
1401114014
}
14012-
x = isNaN(x) ? 0 : x;
14013-
x2 = isNaN(x2) ? 1 : x2;
14014-
y = isNaN(y) ? 0 : y;
14015-
y2 = isNaN(y2) ? 0 : y2;
14015+
x = isSafeNum(x) ? x : 0;
14016+
x2 = isSafeNum(x2) ? x2 : 1;
14017+
y = isSafeNum(y) ? y : 0;
14018+
y2 = isSafeNum(y2) ? y2 : 0;
1401614019
var canvasGradient = ctx.createLinearGradient(x, y, x2, y2);
1401714020
return canvasGradient;
1401814021
}
@@ -14028,6 +14031,9 @@
1402814031
y = y * height + rect.y;
1402914032
r = r * min;
1403014033
}
14034+
x = isSafeNum(x) ? x : 0.5;
14035+
y = isSafeNum(y) ? y : 0.5;
14036+
r = r >= 0 && isSafeNum(r) ? r : 0.5;
1403114037
var canvasGradient = ctx.createRadialGradient(x, y, 0, x, y, r);
1403214038
return canvasGradient;
1403314039
}

dist/zrender.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/zrender.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zrender",
3-
"version": "5.3.1",
3+
"version": "5.3.2",
44
"description": "A lightweight graphic library providing 2d draw for Apache ECharts",
55
"keywords": [
66
"canvas",

src/zrender.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ export function registerPainter(name: string, Ctor: PainterBaseCtor) {
472472
/**
473473
* @type {string}
474474
*/
475-
export const version = '5.3.0';
475+
export const version = '5.3.2';
476476

477477

478478
export interface ZRenderType extends ZRender {};

0 commit comments

Comments
 (0)