Modify the Spec about the simpleDur property

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index 3dadb81..ea03546 100644 (file)
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -719,7 +719,6 @@ base("$calcMode").up("$attribute").mix( {
                     max: (getAttr("max") || "indefinite")\r
                   } )\r
                 } ).parse();\r
-    frame.calcMode = this.up("$calcMode");\r
     if (frame.isResolved) {\r
       frame.listener( {\r
         timeStamp: Date.now()\r

diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 6c228d6..beaef00 100644 (file)
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2558,13 +2558,14 @@ describe("SMIL Animation Spec", function() {
     } )\r
   } );\r
   describe("A $activate object", function() {\r
-    var act = base("$frame").$begin.$activate;\r
+    var act = base("$frame").$begin.$activate.up();\r
      beforeEach( function() {\r
       act.dur = "indefinite";\r
       act.begin = 0;\r
       act.repeatCount = null;\r
       act.repeatDur = null;\r
       act.end = act.$begin.$end;\r
+      act.simpleDur = base("$frame").$begin.$activate.simpleDur;\r
     } );\r
     /*境界条件を調べておく (limit value analysis)*/\r
     it("should be this for the value  (limit value analysis)", function() {\r
@@ -3317,6 +3318,7 @@ describe("SMIL Animation Spec", function() {
         base("$frame").timelines.length = 0;\r
         base("$frame").startTime = Date.now();\r
         s = document.createElement("animate");\r
+        base("$frame").$begin.$activate.dur = "indefinite";\r
       } );\r
       /*境界条件を調べておく (limit value analysis)*/\r
       it("should be this for the value  (limit value analysis)", function() {\r
@@ -3355,6 +3357,7 @@ describe("SMIL Animation Spec", function() {
           expect(act.repeatDur).toBeNull();\r
           expect(act.min).toBe("0");\r
           expect(act.max).toBe("indefinite");\r
+          expect(act.simpleDur).toBeNull();\r
           \r
           s.removeAttribute(attrName);\r
           expect(s.hasAttributeNS(null, attrName)).toBeFalsy();\r
@@ -3362,10 +3365,6 @@ describe("SMIL Animation Spec", function() {
           expect(attr.element).toBe(p);\r
           expect(attr.frame.timelines.length).toEqual(num);\r
         };\r
-        \r
-                \r
-        var line = attr.frame.timelines[0];\r
-        expect(line.calcMode).not.toBeUndefined();\r
       } );\r
       /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/\r
       it("should be this for the value (the valid partion on a spline mode )", function() {\r
@@ -3374,12 +3373,13 @@ describe("SMIL Animation Spec", function() {
         p.appendChild(s);\r
         var values = [ "0",\r
                       null, null, null, null, \r
-                      "0", "indefinite"\r
+                      "0", "indefinite", null\r
                     ];\r
         check2("begin", "0");\r
         values[0] = "1";\r
         check2("begin", "1");\r
         values[1] = "0";\r
+        values[7] = "0";\r
         check2("dur", "0");\r
         values[2] = 0;\r
         check2("end", "0");\r
@@ -3407,6 +3407,7 @@ describe("SMIL Animation Spec", function() {
           expect(act.repeatDur).toBe(values[4]);\r
           expect(act.min).toBe(values[5]);\r
           expect(act.max).toBe(values[6]);\r
+          expect(act.simpleDur).toBe(values[7]);\r
         };\r
       } );\r
       /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/\r