Add a type property to the object

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index 50344de..472e3d9 100644 (file)
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -1408,12 +1408,16 @@ base("$calcMode").up("$attribute").mix( {
  .up("$animateTransformElement")\r
  .mix({\r
    /*__transformListで何番目のアイテムかを示すプロパティ*/\r
-   numberOfList: -1\r
+   numberOfList: -1,\r
+   \r
+   /*type属性の値*/\r
+   type: "translate"\r
   })\r
  .on("init", function(ele) {\r
    if (!ele || !ele.parentNode) {\r
      return;\r
    }\r
+   this.type = this._getAttr("type", "translate");\r
    var parent = ele.parentNode;\r
    if (!parent.__transformList) {\r
      parent.__transformList = [];\r
@@ -1422,7 +1426,7 @@ base("$calcMode").up("$attribute").mix( {
     && (this.numberOfList < 0) ) {\r
      /*もし、今まで、このオブジェクトで、initメソッドを実行していなければ*/\r
      this.numberOfList = parent.__transformList.length;\r
-     parent.__transformList.push( this._getAttr("type", "translate") + "(0)" );\r
+     parent.__transformList.push( this.type + "(0)" );\r
    }\r
    this.funcs = this.funcs.map( function(x) {\r
      return x;\r

diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 703f1a4..e8b2b84 100644 (file)
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2538,28 +2538,34 @@ describe("SMIL Animation Spec", function() {
         /*境界条件を調べておく (limit value analysis)*/\r
         it("should be this for the value  (limit value analysis)", function() {\r
           expect($animate.numberOfList).toBe(-1);\r
+          expect($animate.type).toBe("translate");\r
           expect(p.__transformList).toBeUndefined();\r
           $animate.init();\r
           expect($animate.numberOfList).toBe(-1);\r
           expect(p.__transformList).toBeUndefined();\r
+          expect($animate.type).toBe("translate");\r
           $animate.init(p);\r
           expect($animate.numberOfList).toBe(-1);\r
           expect(p.__transformList).toBeUndefined();\r
+          expect($animate.type).toBe("translate");\r
           $animate.init(ele);\r
           expect($animate.numberOfList).toBe(-1);\r
           expect(p.__transformList).toEqual([]);\r
           ele.setAttributeNS(null, "values", "0;1");\r
           $animate.init(ele);\r
+          expect($animate.type).toBe("translate");\r
           expect($animate.numberOfList).toBe(0);\r
           expect(p.__transformList).toEqual(["translate(0)"]);\r
           ele.setAttributeNS(null, "type", "translate");\r
           $animate.init(ele);\r
           expect($animate.numberOfList).toBe(0);\r
+          expect($animate.type).toBe("translate");\r
           expect(p.__transformList).toEqual(["translate(0)"]);\r
           ele.parentNode.appendChild(ele.cloneNode(true));\r
           $animate.numberOfList = -1;\r
           $animate.init(ele.parentNode.lastChild);\r
           expect(p.__transformList).toEqual(["translate(0)", "translate(0)"]);\r
+          expect($animate.type).toBe("translate");\r
           \r
           delete p.__transformList;\r
           ele.setAttributeNS(null, "type", "scale");\r
@@ -2567,6 +2573,7 @@ describe("SMIL Animation Spec", function() {
           $animate.init(ele);\r
           expect($animate.numberOfList).toBe(0);\r
           expect(p.__transformList).toEqual(["scale(0)"]);\r
+          expect($animate.type).toBe("scale");\r
         } );\r
       } );\r
     } );\r