Modify a call method in the object

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index 84b0344..7fa3f6f 100644 (file)
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -174,7 +174,7 @@ base("$frame").mix ( {
   \r
   /*removeLine メソッド\r
    * 指定されたタイムラインのオブジェクトを、リストから削除する*/\r
-  removeLine: function( /*Object*/ timeline ) {\r
+  removeLine: function( /*$frame*/ timeline ) {\r
     var list = this.timelines,\r
         j = 0,\r
         t;\r
@@ -289,7 +289,8 @@ base("$frame").mix ( {
       var s = this.$activate.up();\r
       s.begin = this.begin;\r
       s.timeStamp= evt.timeStamp;\r
-      this.addLine(s.call());\r
+      this.activeTime = s.call();\r
+      this.addLine(this);\r
       return s;\r
     }\r
     \r
@@ -322,9 +323,7 @@ base("$frame").mix ( {
       if (!isIndefiniteDur) {\r
         actTime = Math.floor( this.offset(this.dur) * this.fpms);\r
       }\r
-      return {\r
-        activeTime: actTime\r
-      };\r
+      return actTime;\r
     }\r
   } );\r
 } );\r

diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 9ed0f3e..54f4cf4 100644 (file)
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2421,8 +2421,7 @@ describe("SMIL Animation Spec", function() {
       expect(act.end).toBe(act.$begin.$end);\r
 \r
       act.up("$a");\r
-      expect(act.$a.call()).not.toBe(act.$a);\r
-      expect(act.$a.call().activeTime).toBeNull();\r
+      expect(act.$a.call()).toBeNull();\r
     } );\r
     /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/\r
     it("should be this for the value (the valid partion)", function() {\r
@@ -2431,7 +2430,7 @@ describe("SMIL Animation Spec", function() {
       act.up("$b");\r
       act.$b.dur = "132ms";\r
       var abc = act.$b.call();\r
-      expect(abc.activeTime).toEqual(Math.floor(132*act.fpms))\r
+      expect(abc).toEqual(Math.floor(132*act.fpms))\r
     } );\r
     /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/\r
     it("should be this for the value (the invalid partion)", function() {\r