From 4cf4e889029900abf9b46af38398200466cda84d Mon Sep 17 00:00:00 2001 From: dhrname Date: Fri, 28 Oct 2016 22:14:42 +0900 Subject: [PATCH] Modify the updateState method --- org/w3c/dom/smil.js | 2 +- tool/Spec/spec/SvgDomSpec.js | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js index 130068a..3918046 100644 --- a/org/w3c/dom/smil.js +++ b/org/w3c/dom/smil.js @@ -189,7 +189,7 @@ base("$frame").mix ( { this.state = begin; /*beginプロパティに開始時刻をキャッシュ用に保存*/ this.begin = startTime; - } else if (!f && !startTime) { + } else if (!startTime) { /*開始時刻が0ならば、アニメーションを開始*/ this.state = begin; } diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js index 8c634a4..902c7a9 100644 --- a/tool/Spec/spec/SvgDomSpec.js +++ b/tool/Spec/spec/SvgDomSpec.js @@ -428,8 +428,8 @@ describe("SMIL Animation Spec", function() { frame.setFrame(i); } - frame.beginList = frame.$list.beginList; - frame.endList = frame.$list.endList; + frame.beginList = base("$frame").$listbeginList; + frame.endList = base("$frame").$list.endList; frame.state = frame.WAITING; frame.begin = 0; var obj = { name: "", value: 0}; @@ -471,6 +471,14 @@ describe("SMIL Animation Spec", function() { frame.setFrame(0); expect(t).toBe(2); + t=0; + frame.begin = 0; + frame.state = frame.WAITING; + expect(frame.getMaxList(12, frame.endList)).toBe(0); + frame.setFrame(12); + expect(frame.state).toBe(frame.POSTWAITING); + expect(t).toBe(2); + /*addBeginListメソッドのチェックなど*/ expect(frame.addBeginList(1).value).toBe(1); expect(frame.addBeginList(0).value).toBe(0); @@ -2185,6 +2193,7 @@ describe("SMIL Animation Spec", function() { expect(ele.parentNode.getAttributeNS(null, "fill")).toBe("red"); frame.setFrame(24); + expect($set.timeline.state).toBe($set.timeline.POSTWAITNG); expect(ele.parentNode.hasAttributeNS(null, "fill")).toBeFalsy(); } ); /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/ -- 2.11.0