Modify the setFrame method of the object

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index c880a0b..e03b397 100644 (file)
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -250,8 +250,10 @@ base("$frame").mix ( {
         for (var i=0;i<list.length;++i) {\r
           list[i](this);\r
         }\r
-        this.updateState(f);\r
-      } else if (state === /*this.ENDING*/ 3) {\r
+        /*開始時刻と終了時刻が一致した場合はstateはENDING状態*/\r
+        state = this.updateState(f).state;\r
+      }\r
+      if (state === /*this.ENDING*/ 3) {\r
         list = this._endListenerList;\r
         for (var i=0;i<list.length;++i) {\r
           list[i](this);\r

diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 0a4ef97..3d2e4ba 100644 (file)
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -455,16 +455,21 @@ describe("SMIL Animation Spec", function() {
         expect(frame.currentFrame).toBe(0);\r
         expect(frame.state).toBe(frame.POSTWAITING);\r
         expect(obj.value).toBe(1);\r
+        var t = 0;\r
         frame.addEvent("begin", function(evt) {\r
           expect(evt.state).toBe(frame.BEGINNING);\r
+          t = 1;\r
         });\r
         frame.addEvent("end", function(evt) {\r
           expect(evt.state).toBe(frame.ENDING);\r
+          t = 2;\r
         });\r
         frame.addEvent("play", function(evt) {\r
           expect(evt.state).toBe(frame.PLAYING);\r
+          t = 3;\r
         });\r
         frame.setFrame(0);\r
+        expect(t).toBe(2);\r
         \r
         /*addBeginListメソッドのチェックなど*/\r
         expect(frame.addBeginList(1).value).toBe(1);\r