fix: set frame for merge

daybrush · Jun 18, 2019 · 2b2f978 · 2b2f978
1 parent ff7e550
commit 2b2f978
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/Frame.ts b/src/Frame.ts
@@ -157,8 +157,9 @@ class Frame {
         const params = args.slice(0, -1);
         const value = args[length - 1];
         const firstParam = params[0];
-        if (firstParam instanceof Frame) {
-            self.merge(firstParam);
+
+        if (length === 1 && value instanceof Frame) {
+            self.merge(value);
         } else if (firstParam in ALIAS) {
             self._set(ALIAS[firstParam], value);
         } else if (length === 2 && isArray(firstParam)) {
@@ -262,11 +263,9 @@ class Frame {
         const properties = this.properties;
         const frameProperties = frame.properties;
 
-        if (!frameProperties) {
-            return this;
+        if (frameProperties) {
+            merge(properties, frameProperties);
         }
-        merge(properties, frameProperties);
-
         return this;
     }
     /**

diff --git a/src/SceneItem.ts b/src/SceneItem.ts
@@ -241,7 +241,9 @@ class SceneItem extends Animator<SceneItemOptions, SceneItemState> {
   console.log(item.get(0, "a")); // "b"
       */
     public set(time: any, ...args: any[]) {
-        if (isArray(time)) {
+        if (time instanceof SceneItem) {
+            return this.set(0, time);
+        } else if (isArray(time)) {
             const length = time.length;
 
             for (let i = 0; i < length; ++i) {
@@ -272,9 +274,7 @@ class SceneItem extends Animator<SceneItemOptions, SceneItemState> {
         } else {
             const value = args[0];
 
-            if (value instanceof Frame) {
-                this.setFrame(time, value);
-            } else if (value instanceof SceneItem) {
+            if (value instanceof SceneItem) {
                 const delay = value.getDelay();
                 const realTime = this.getUnitTime(time);
                 const frames = value.toObject(!this.hasFrame(realTime + delay));

diff --git a/test/unit/SceneItem.spec.ts b/test/unit/SceneItem.spec.ts
@@ -738,6 +738,7 @@ describe("SceneItem Test", () => {
             expect(frame.get("html3", "c")).to.be.deep.equals(4);
         });
         it(`should check 'append' method`, () => {
+            // 1 3 2
             this.item.append(new SceneItem({
                 0: {
                     a: 3,
@@ -1046,6 +1047,6 @@ describe("SceneItem Test", () => {
             expect(html2).to.be.equals("1");
             expect(html3).to.be.equals("2");
             expect(html4).to.be.equals("3");
-        })
+        });
     });
 });