Skip to content

Commit 4ccacea

Browse files
committed
release v4.3.3
1 parent 6e687ee commit 4ccacea

6 files changed

+11
-10
lines changed

dist/zrender.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ var nativeFilter = arrayProto.filter;
235235
var nativeSlice = arrayProto.slice;
236236
var nativeMap = arrayProto.map;
237237
var nativeReduce = arrayProto.reduce;
238+
var protoKey = '__proto__';
238239

239240
// Avoid assign to an exported variable, for transforming to cjs.
240241
var methods = {};
@@ -297,7 +298,7 @@ function clone(source) {
297298
else if (!BUILTIN_OBJECT[typeStr] && !isPrimitive(source) && !isDom(source)) {
298299
result = {};
299300
for (var key in source) {
300-
if (source.hasOwnProperty(key)) {
301+
if (source.hasOwnProperty(key) && key !== protoKey) {
301302
result[key] = clone(source[key]);
302303
}
303304
}
@@ -320,7 +321,7 @@ function merge(target, source, overwrite) {
320321
}
321322

322323
for (var key in source) {
323-
if (source.hasOwnProperty(key)) {
324+
if (source.hasOwnProperty(key) && key !== protoKey) {
324325
var targetProp = target[key];
325326
var sourceProp = source[key];
326327

@@ -369,7 +370,7 @@ function mergeAll(targetAndSources, overwrite) {
369370
*/
370371
function extend(target, source) {
371372
for (var key in source) {
372-
if (source.hasOwnProperty(key)) {
373+
if (source.hasOwnProperty(key) && key !== protoKey) {
373374
target[key] = source[key];
374375
}
375376
}
@@ -384,7 +385,7 @@ function extend(target, source) {
384385
*/
385386
function defaults(target, source, overlay) {
386387
for (var key in source) {
387-
if (source.hasOwnProperty(key)
388+
if (source.hasOwnProperty(key) && key !== protoKey
388389
&& (overlay ? source[key] != null : target[key] == null)
389390
) {
390391
target[key] = source[key];
@@ -11546,7 +11547,7 @@ var instances = {}; // ZRender实例map索引
1154611547
/**
1154711548
* @type {string}
1154811549
*/
11549-
var version = '4.3.2';
11550+
var version = '4.3.3';
1155011551

1155111552
/**
1155211553
* Initializing a zrender instance

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

+1-1
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": "4.3.2",
3+
"version": "4.3.3",
44
"description": "A lightweight canvas library.",
55
"keywords": [
66
"canvas",

src/zrender.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var instances = {}; // ZRender实例map索引
2828
/**
2929
* @type {string}
3030
*/
31-
export var version = '4.3.2';
31+
export var version = '4.3.3';
3232

3333
/**
3434
* Initializing a zrender instance

0 commit comments

Comments
 (0)