Modify a listener method

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index cc8d86e..06bd408 100644 (file)
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -276,23 +276,26 @@ base("$frame").mix ( {
         this.isResolved = true;\r
       }\r
       this.begin = Math.floor( this.begin * this.fpms);\r
+      var s = this.$activate.up();\r
+      s.begin = this.begin;\r
+      s.end = s.end.up();\r
+      this.$$activate = s;\r
       if (event) {\r
         ele = event.id ? this.eventTarget.ownerDocument.getElementById(event.id)\r
                         : this.eventTarget;\r
         ele && ele.addEventListener(event.event, this.listener.bind(this));\r
       }\r
+      s = event = str = plusminus = ele = void 0;\r
       return this;\r
     },\r
     \r
     /*イベントのリスナーとして、parseメソッドで使う*/\r
     listener: function(evt) {\r
-      var s = this.$activate.up();\r
-      s.begin = this.begin;\r
-      s.end = s.end.up();\r
-      s.timeStamp= evt.timeStamp;\r
+      var s = this.$$activate;\r
+      s.timeStamp = evt.timeStamp;\r
       this.activeTime = s.call();\r
       this.addLine(this);\r
-      return s;\r
+      return this;\r
     }\r
     \r
   /*$activate オブジェクト\r

diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 2e171ef..7ee9ce8 100644 (file)
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2371,12 +2371,28 @@ describe("SMIL Animation Spec", function() {
     describe("A listener method in $begin object", function() {\r
        beforeEach( function() {\r
         begin.string = "";\r
+        /*配列は初期化しておく*/\r
+        begin.timelines.length = 0;\r
       } );\r
       /*境界条件を調べておく (limit value analysis)*/\r
       it("should be this for the value  (limit value analysis)", function() {\r
-        expect(begin.listener({\r
+        var lis = begin.listener( {\r
             timeStamp: 0\r
-          }).timeStamp).toEqual(0);\r
+          } );\r
+        expect(lis).toBe(begin);\r
+        expect(lis.begin).toBe(0);\r
+        expect(lis.activeTime).toBeNull();\r
+        expect(lis.timelines.length).toBe(0);\r
+        \r
+        lis = begin.up().mix( {\r
+                begin: 0,\r
+                dur: "12"\r
+              })\r
+              .listener( {\r
+                timeStamp: 0\r
+              } );\r
+        expect(lis.begin).toBe(0);\r
+        expect(lis.activeTime).toEqual(Math.floor(12000*lis.fpms));\r
       } );\r
       /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/\r
       it("should be this for the value (the valid partion)", function() {\r