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

2 years ago · 9b11166bc9
2 changed files with 2 additions and 2 deletions
--- a/packages/fineui/src/core/func/array.js
+++ b/packages/fineui/src/core/func/array.js
@ -7,7 +7,7 @@ export function pushArray(sArray, array) {
 }

 export function pushDistinct(sArray, obj) {
-    if (sArray.indexOf(obj) !== -1) {
+    if (sArray.indexOf(obj) === -1) {
        sArray.push(obj);
    }
 }
--- a/packages/fineui/src/fix/fix.js
+++ b/packages/fineui/src/fix/fix.js
@ -635,7 +635,7 @@ const Observer = (function() {

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