Skip to content

Commit 7bbbdbe

Browse files
authored
Merge pull request #1107 from ecomfe/release-dev
Release v5.6.1
2 parents 45df132 + 6eb0c73 commit 7bbbdbe

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

dist/zrender.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@
368368
}
369369
else {
370370
for (var key in arr) {
371-
if (arr.hasOwnProperty(key) && key !== protoKey) {
371+
if (arr.hasOwnProperty(key)) {
372372
cb.call(context, arr[key], key, arr);
373373
}
374374
}
@@ -436,11 +436,11 @@
436436
return [];
437437
}
438438
if (Object.keys) {
439-
return filter(Object.keys(obj), function (key) { return key !== protoKey; });
439+
return Object.keys(obj);
440440
}
441441
var keyList = [];
442442
for (var key in obj) {
443-
if (obj.hasOwnProperty(key) && key !== protoKey) {
443+
if (obj.hasOwnProperty(key)) {
444444
keyList.push(key);
445445
}
446446
}

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.

src/core/util.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ export function each<I extends Dictionary<any> | any[] | readonly any[] | ArrayL
319319
}
320320
else {
321321
for (let key in arr) {
322-
if (arr.hasOwnProperty(key) && key !== protoKey) {
322+
if (arr.hasOwnProperty(key)) {
323323
cb.call(context, (arr as Dictionary<any>)[key], key as any, arr);
324324
}
325325
}
@@ -436,11 +436,11 @@ export function keys<T extends object>(obj: T): (KeyOfDistributive<T> & string)[
436436
// `Object.keys` only return string rather than `number | string`.
437437
type TKeys = KeyOfDistributive<T> & string;
438438
if (Object.keys) {
439-
return filter(Object.keys(obj) as TKeys[], key => key !== protoKey);
439+
return Object.keys(obj) as TKeys[];
440440
}
441441
let keyList: TKeys[] = [];
442442
for (let key in obj) {
443-
if (obj.hasOwnProperty(key) && key !== protoKey) {
443+
if (obj.hasOwnProperty(key)) {
444444
keyList.push(key as any);
445445
}
446446
}

0 commit comments

Comments
 (0)