Browse Source

Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6

es6
Treecat 2 years ago
parent
commit
9b11166bc9
  1. 2
      packages/fineui/src/core/func/array.js
  2. 2
      packages/fineui/src/fix/fix.js

2
packages/fineui/src/core/func/array.js

@ -7,7 +7,7 @@ export function pushArray(sArray, array) {
} }
export function pushDistinct(sArray, obj) { export function pushDistinct(sArray, obj) {
if (sArray.indexOf(obj) !== -1) { if (sArray.indexOf(obj) === -1) {
sArray.push(obj); sArray.push(obj);
} }
} }

2
packages/fineui/src/fix/fix.js

@ -635,7 +635,7 @@ const Observer = (function() {
function protoAugment(target, src, keys) { function protoAugment(target, src, keys) {
/* eslint-disable no-proto */ /* eslint-disable no-proto */
target.__proto__ = src; Object.setPrototypeOf(target, src);
/* eslint-enable no-proto */ /* eslint-enable no-proto */
} }

Loading…
Cancel
Save