\r
/*removeLine メソッド\r
* 指定されたタイムラインのオブジェクトを、リストから削除する*/\r
- removeLine: function( /*Object*/ timeline ) {\r
+ removeLine: function( /*$frame*/ timeline ) {\r
var list = this.timelines,\r
j = 0,\r
t;\r
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
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
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
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