OSDN Git Service

Edit the Spec for the object
authordhrname <dhrname@users.sourceforge.jp>
Sat, 15 Oct 2016 13:36:01 +0000 (22:36 +0900)
committerdhrname <dhrname@users.sourceforge.jp>
Sat, 15 Oct 2016 13:36:01 +0000 (22:36 +0900)
org/w3c/dom/smil.js
tool/Spec/spec/SvgDomSpec.js

index 4b303a5..93ade37 100644 (file)
@@ -386,7 +386,18 @@ base("$frame").mix ( {
         ele = event.id ? this.eventTarget.ownerDocument.getElementById(event.id)\r
                         : this.eventTarget;\r
         /*イベントの時間差を設定しておく*/\r
-        this.eventOffset = this.begin;\r
+        var eventOffset = this.eventOffset = this.begin,\r
+        /*イベントのリスナーとして、parseメソッドで使う*/\r
+            listener = function(evt) {\r
+              this.begin = eventOffset + this.$frame.currentFrame;\r
+              var s = this.$activate;\r
+              s.begin = this.begin;\r
+              this.activeTime = s.call() || Number.MAX_VALUE;\r
+              this.simpleDuration = s.simpleDur;\r
+              s = void 0;\r
+              this.$frame.addLine(this);\r
+              this.isResolved = true;\r
+            }\r
         if (this.repeat > 0) {\r
           ele && ele.addEventListener("repeatEvent", (function(evt) {\r
             if (evt.detail === this.repeat) {\r
index c329df5..4cab275 100644 (file)
@@ -1022,34 +1022,6 @@ describe("SMIL Animation Spec", function() {
       expect(abc).toBe(act.$b.simpleDur);\r
       act.dur = null;\r
       expect(act.up().call()).toBeNull();\r
-      \r
-      /*AD = end -begin*/\r
-      act.begin = 1;\r
-      act.up("$eb").end = act.end.up().mix( {string: "120ms" } );\r
-      expect( act.$eb.mix( {\r
-        dur: "indefinite",\r
-        simpleDur: act.simpleDur,\r
-        repeatCount: 12,\r
-        repeatDur: null,\r
-      } ).call() ).toBe(Math.floor(120*act.fpms) - 1);\r
-      expect( act.$eb.mix( {\r
-        dur: "12",\r
-        repeatCount: "indefinite",\r
-        repeatDur: null,\r
-      } ).call() ).toBe(Math.floor(120*act.fpms) - 1);\r
-      expect( act.$eb.mix( {\r
-        dur: "12",\r
-        simpleDur: act.simpleDur,
-        repeatCount: null,\r
-        repeatDur: "indefinite",\r
-      } ).call() ).toBe(Math.floor(120*act.fpms) - 1);\r
-      act.$eb.end *= 3;\r
-      expect( act.$eb.mix( {\r
-        dur: "12",\r
-        simpleDur: act.simpleDur,
-        repeatCount: "indefinite",\r
-        repeatDur: "indefinite",\r
-      } ).call() ).toBe(Math.floor(120*act.fpms)*3 - 1);\r
 \r
       /*AD = Min(dur, end - begin)*/\r
       act.up("$c").end = act.end.up().mix( { string: "12" } );\r