From: dhrname <dhrname@users.sourceforge.jp>
Date: Sun, 19 Apr 2015 13:32:00 +0000 (+0900)
Subject: Support the from attribute
X-Git-Tag: version22~219
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=26177392afc592c6e17bdab2803f5581af0f2fca;p=sie%2Fsie.git

Support the from attribute
---

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index 0129c8b..a6df45b 100644
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -743,17 +743,18 @@ base("$calcMode").up("$attribute").mix( {
                  from: base("$from").up()
                } )
              } );
+     /*from属性はオプションなので、条件には付け加えない*/
      if (values && values.length) {
        /*values属性が指定された場合、他の属性は無視される
         * W3C仕様　SMIL アニメーション 3.2.2. アニメーション関数の値*/
        s.to.string = values[1];
        s.to.from.string = values[0];
-     } else if (from && to) {
+     } else if (to) {
        s.to.string = to;
-       s.to.from.string = from;
-     } else if (from && by) {
+       s.to.from.string = from || "0";
+     } else if (by) {
        s.to.string = by;
-       s.to.from.string = from;
+       s.to.from.string = from || "0";
        var toNumList = s.to.call(),
            fromNumList = s.to.from;
        for (var i=0;i<toNumList.length;++i) {
diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 68a0128..1f78c4b 100644
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -3455,8 +3455,15 @@ describe("SMIL Animation Spec", function() {
         
         /*from-by アニメーション*/
         expect(attr.setValues(null, "1", null, "1").to.string).toBe("1");
-        expect(attr.setValues(null, "1", null, "1").to.from.string).toBe("1");
+        expect(attr.setValues(null, "1", null, "1").to.from[0]).toEqual(1);
         expect(attr.setValues(null, "1", null, "1").to.numList[0]).toEqual(2);
+        
+        /*fromなしto アニメーション*/
+        expect(attr.setValues(null, null, "1").to.string).toBe("1");
+        expect(attr.setValues(null, null, "1").to.from.string).toBe("0");
+        var aset = attr.setValues(null, null, "1").to;
+        aset.call();
+        expect(aset.from[0]).toEqual(0);
       } );
       /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
       it("should be this for the value (the valid partion on a spline mode )", function() {