From: dhrname <dhrname@users.sourceforge.jp>
Date: Thu, 11 Jun 2015 14:29:56 +0000 (+0900)
Subject: Support to the animate element
X-Git-Tag: version22~149
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=466a7106ca757f70912df09aa835cbe9e9a959b7;p=sie%2Fsie.git

Support to the animate element
---

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index 58282f8..cd953d1 100644
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -1015,6 +1015,7 @@ base("$calcMode").up("$attribute").mix( {
            return rgbColor;
         };
   }
+  ele && (this.mode = ele.getAttributeNS(null, "calcMode") || "linear")
   if (to) {
     this._funcs = to.map( function(x) {
       x.to.string = toRGB(x.to.string);
@@ -1032,8 +1033,25 @@ base("$calcMode").up("$attribute").mix( {
 
 function getDocument() 
 {
-  var svg = document.getElementsByTagName("object").item(0),
-      svgDoc = svg && svg.getSVGDocument();
+  var svg = document.getElementsByTagName("object"),
+      svgns = "http://www.w3.org/2000/svg";
+  for (var i=0;i<svg.length;++i) {
+    if (svg) {
+      var svgDoc = svg[i].getSVGDocument(),
+          setElements = svgDoc.getElementsByTagNameNS(svgns, "set"),
+          animateElements = svgDoc.getElementsByTagNameNS(svgns, "animate");
+      init(base("$calcMode").$attribute.$setElement, setElements);
+      init(base("$calcMode").$attribute.$setElement.$animateElement, animateElements);
+    }
+  }
+  
+  function init (obj, eles) {
+    console.log(obj)
+    for (var i=0;i<eles.length;++i) {
+      obj.up().init(eles.item(i));
+    }
+  };
+  base("$frame").setFrame(300)
 }
 window.addEventListener && window.addEventListener("load", getDocument);
 //#endif // _SMIL_IDL_
diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 0501220..c4bc844 100644
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -3150,7 +3150,7 @@ describe("SMIL Animation Spec", function() {
       
       /*discrete mode*/
       calc.mode = "discrete";
-      expect(calc.call()(0)).toBe("1");
+      expect(calc.call()(0)).toBe("0");
       expect(calc.call()(1)).toBe("1");
     } );
     /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
@@ -3748,12 +3748,20 @@ describe("SMIL Animation Spec", function() {
           f(24, "M20.0 0.0 L20.0 30.0");
           f(36, "M20.0 10.0 L15.0 30.0");
           f(48, "");
-          
+                    
           ele.setAttributeNS(null, "fill", "freeze");
           $animate.init(ele);
           f(24, "M20.0 0.0 L20.0 30.0");
           f(36, "M20.0 10.0 L15.0 30.0");
           f(48, "M20.0 20.0 L10.0 30.0");
+          
+          frame.timelines.length = 0;
+          ele.setAttributeNS(null, "calcMode", "discrete");
+          $animate.init(ele);
+          expect($animate.mode).toBe("discrete");
+          f(24, "M20 0 L20 30");
+          f(36, "M20 20 L20 30");
+          f(48, "M20 20 L10 30");
         } );
         /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
         it("should be this for the value (the valid partion )", function() {